diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2010-05-27 12:44:07 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-05-27 12:44:07 +0200 |
| commit | 293b05335ab540c4c8402e0a5caf2886b786a318 (patch) | |
| tree | 11e5a7c2dce338058f150e08d1ff47c9d4d8eccd /recipes/dhcdbd | |
| parent | 1ee2156592ba17f64f3c9b8970285a259730b871 (diff) | |
| parent | e9aacc4ce4784c91cb4908145b8fb7b3ec8aa6e0 (diff) | |
| download | openembedded-293b05335ab540c4c8402e0a5caf2886b786a318.tar.gz | |
Merge remote branch 'origin/org.openembedded.dev' into shr/testing2010
Conflicts:
recipes/linux/linux-openmoko-devel_git.bb
recipes/openmoko-3rdparty/pisi_0.5.2.bb
recipes/openmoko-3rdparty/pisi_0.5.3.bb
recipes/openmoko-3rdparty/pisi_0.5.bb
recipes/uclibc/uclibc_nptl.bb
Diffstat (limited to 'recipes/dhcdbd')
| -rw-r--r-- | recipes/dhcdbd/dhcdbd_1.14.bb | 4 | ||||
| -rw-r--r-- | recipes/dhcdbd/dhcdbd_1.16.bb | 2 | ||||
| -rw-r--r-- | recipes/dhcdbd/dhcdbd_2.0.bb | 6 | ||||
| -rw-r--r-- | recipes/dhcdbd/dhcdbd_3.0.bb | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/recipes/dhcdbd/dhcdbd_1.14.bb b/recipes/dhcdbd/dhcdbd_1.14.bb index 850ae5456f..69d11d6ed2 100644 --- a/recipes/dhcdbd/dhcdbd_1.14.bb +++ b/recipes/dhcdbd/dhcdbd_1.14.bb @@ -7,8 +7,8 @@ DEPENDS = "dbus" PR = "r1" SRC_URI = "https://fedorahosted.org/releases/d/h/dhcdbd/dhcdbd-${PV}.tar.bz2 \ - file://dhcdbd-1.14-pkgconfig_dbus.patch;patch=1 \ - file://dbus-api-fix.patch;patch=1 \ + file://dhcdbd-1.14-pkgconfig_dbus.patch \ + file://dbus-api-fix.patch \ file://dhcdbd" do_compile() { diff --git a/recipes/dhcdbd/dhcdbd_1.16.bb b/recipes/dhcdbd/dhcdbd_1.16.bb index 61ebf8ae84..4acc05c401 100644 --- a/recipes/dhcdbd/dhcdbd_1.16.bb +++ b/recipes/dhcdbd/dhcdbd_1.16.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" DEPENDS = "dbus" SRC_URI = "https://fedorahosted.org/releases/d/h/dhcdbd/dhcdbd-${PV}.tar.gz \ - file://dhcdbd-1.14-pkgconfig_dbus.patch;patch=1 \ + file://dhcdbd-1.14-pkgconfig_dbus.patch \ file://dhcdbd" do_compile() { diff --git a/recipes/dhcdbd/dhcdbd_2.0.bb b/recipes/dhcdbd/dhcdbd_2.0.bb index 4b0408f4df..b29bdad593 100644 --- a/recipes/dhcdbd/dhcdbd_2.0.bb +++ b/recipes/dhcdbd/dhcdbd_2.0.bb @@ -6,9 +6,9 @@ RDEPENDS = "dhcp-client" PR = "r1" SRC_URI = "https://fedorahosted.org/releases/d/h/dhcdbd/dhcdbd-${PV}.tar.bz2 \ - file://dbus_connection_unref.patch;patch=1 \ - file://paths.patch;patch=1 \ - file://no-ext-options.patch;patch=1 \ + file://dbus_connection_unref.patch \ + file://paths.patch \ + file://no-ext-options.patch \ file://dhcdbd" inherit update-rc.d diff --git a/recipes/dhcdbd/dhcdbd_3.0.bb b/recipes/dhcdbd/dhcdbd_3.0.bb index 563155e021..e34665e64e 100644 --- a/recipes/dhcdbd/dhcdbd_3.0.bb +++ b/recipes/dhcdbd/dhcdbd_3.0.bb @@ -6,8 +6,8 @@ RDEPENDS = "dhcp-client" PR = "r1" SRC_URI = "https://fedorahosted.org/releases/d/h/dhcdbd/dhcdbd-${PV}.tar.bz2 \ - file://dbus_connection_unref.patch;patch=1 \ - file://paths.patch;patch=1 \ + file://dbus_connection_unref.patch \ + file://paths.patch \ file://dhcdbd" inherit update-rc.d |