summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-01-13 23:25:08 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-01-13 23:25:08 +0000
commit07046f300bbd6048fce7abf5390ccf417f986af0 (patch)
treebddd0bae55e127418180af5f5c3dfe5fad474c17
parent5c0a06b85f07ea903d92eea77a1665799d476968 (diff)
downloadpoky-07046f300bbd6048fce7abf5390ccf417f986af0.tar.gz
dpkg: Convert to BBCLASSEXTEND
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/dpkg/dpkg-native_1.14.19.bb13
-rw-r--r--meta/packages/dpkg/dpkg.inc6
-rw-r--r--meta/packages/dpkg/dpkg/autofoo.patch (renamed from meta/packages/dpkg/files/autofoo.patch)0
-rw-r--r--meta/packages/dpkg/dpkg/ignore_extra_fields.patch (renamed from meta/packages/dpkg/files/ignore_extra_fields.patch)0
-rw-r--r--meta/packages/dpkg/dpkg/nochroot.patch (renamed from meta/packages/dpkg/files/nochroot.patch)0
-rw-r--r--meta/packages/dpkg/dpkg/noman.patch (renamed from meta/packages/dpkg/files/noman.patch)0
-rw-r--r--meta/packages/dpkg/dpkg/noupdalt.patch (renamed from meta/packages/dpkg/files/noupdalt.patch)0
-rw-r--r--meta/packages/dpkg/dpkg_1.14.19.bb5
8 files changed, 8 insertions, 16 deletions
diff --git a/meta/packages/dpkg/dpkg-native_1.14.19.bb b/meta/packages/dpkg/dpkg-native_1.14.19.bb
deleted file mode 100644
index bf947b5054..0000000000
--- a/meta/packages/dpkg/dpkg-native_1.14.19.bb
+++ /dev/null
@@ -1,13 +0,0 @@
1require dpkg.inc
2DEPENDS += "bzip2-native zlib-native virtual/update-alternatives-native"
3SRC_URI += "file://noman.patch;patch=1"
4
5inherit native
6
7EXTRA_OECONF = "--without-static-progs \
8 --without-dselect \
9 --with-start-stop-daemon \
10 --with-zlib \
11 --with-bz2lib \
12 --without-selinux \
13 --without-sgml-doc"
diff --git a/meta/packages/dpkg/dpkg.inc b/meta/packages/dpkg/dpkg.inc
index 67c0781ce8..d002b3ec8a 100644
--- a/meta/packages/dpkg/dpkg.inc
+++ b/meta/packages/dpkg/dpkg.inc
@@ -7,7 +7,11 @@ SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz \
7 file://ignore_extra_fields.patch;patch=1 \ 7 file://ignore_extra_fields.patch;patch=1 \
8 file://noupdalt.patch;patch=1" 8 file://noupdalt.patch;patch=1"
9 9
10S = "${WORKDIR}/dpkg-${PV}" 10DEPENDS = "zlib bzip2"
11DEPENDS_virtclass-native = "bzip2-native zlib-native virtual/update-alternatives-native"
12RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}"
13
14S = "${WORKDIR}/${BPN}-${PV}"
11 15
12PARALLEL_MAKE = "" 16PARALLEL_MAKE = ""
13 17
diff --git a/meta/packages/dpkg/files/autofoo.patch b/meta/packages/dpkg/dpkg/autofoo.patch
index 691121e418..691121e418 100644
--- a/meta/packages/dpkg/files/autofoo.patch
+++ b/meta/packages/dpkg/dpkg/autofoo.patch
diff --git a/meta/packages/dpkg/files/ignore_extra_fields.patch b/meta/packages/dpkg/dpkg/ignore_extra_fields.patch
index d09343c6e5..d09343c6e5 100644
--- a/meta/packages/dpkg/files/ignore_extra_fields.patch
+++ b/meta/packages/dpkg/dpkg/ignore_extra_fields.patch
diff --git a/meta/packages/dpkg/files/nochroot.patch b/meta/packages/dpkg/dpkg/nochroot.patch
index 3a8beaebbf..3a8beaebbf 100644
--- a/meta/packages/dpkg/files/nochroot.patch
+++ b/meta/packages/dpkg/dpkg/nochroot.patch
diff --git a/meta/packages/dpkg/files/noman.patch b/meta/packages/dpkg/dpkg/noman.patch
index f5984fe14a..f5984fe14a 100644
--- a/meta/packages/dpkg/files/noman.patch
+++ b/meta/packages/dpkg/dpkg/noman.patch
diff --git a/meta/packages/dpkg/files/noupdalt.patch b/meta/packages/dpkg/dpkg/noupdalt.patch
index 023e99ae8d..023e99ae8d 100644
--- a/meta/packages/dpkg/files/noupdalt.patch
+++ b/meta/packages/dpkg/dpkg/noupdalt.patch
diff --git a/meta/packages/dpkg/dpkg_1.14.19.bb b/meta/packages/dpkg/dpkg_1.14.19.bb
index 1a7991d40e..1e54306c93 100644
--- a/meta/packages/dpkg/dpkg_1.14.19.bb
+++ b/meta/packages/dpkg/dpkg_1.14.19.bb
@@ -1,6 +1,4 @@
1require dpkg.inc 1require dpkg.inc
2DEPENDS += "zlib bzip2"
3RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}"
4 2
5SRC_URI += "file://noman.patch;patch=1" 3SRC_URI += "file://noman.patch;patch=1"
6 4
@@ -9,4 +7,7 @@ EXTRA_OECONF = "--without-static-progs \
9 --with-start-stop-daemon \ 7 --with-start-stop-daemon \
10 --with-zlib \ 8 --with-zlib \
11 --with-bz2lib \ 9 --with-bz2lib \
10 --without-selinux \
12 --without-sgml-doc" 11 --without-sgml-doc"
12
13BBCLASSEXTEND = "native"