summaryrefslogtreecommitdiffstats
path: root/meta/packages/dpkg
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/dpkg')
-rw-r--r--meta/packages/dpkg/dpkg-native_1.13.22.bb3
-rw-r--r--meta/packages/dpkg/dpkg.inc28
-rw-r--r--meta/packages/dpkg/dpkg_1.13.22.bb5
-rw-r--r--meta/packages/dpkg/files/nochroot.patch18
-rw-r--r--meta/packages/dpkg/files/noupdalt.patch16
5 files changed, 64 insertions, 6 deletions
diff --git a/meta/packages/dpkg/dpkg-native_1.13.22.bb b/meta/packages/dpkg/dpkg-native_1.13.22.bb
index 2f196c2ea6..db71ab08e8 100644
--- a/meta/packages/dpkg/dpkg-native_1.13.22.bb
+++ b/meta/packages/dpkg/dpkg-native_1.13.22.bb
@@ -1,8 +1,9 @@
1require dpkg.inc 1require dpkg.inc
2PR = "r1"
3DEPENDS += "ncurses-native zlib-native virtual/update-alternatives"
2SRC_URI += "file://noman.patch;patch=1" 4SRC_URI += "file://noman.patch;patch=1"
3 5
4inherit native 6inherit native
5inherit autotools gettext
6 7
7EXTRA_OECONF = "--without-static-progs \ 8EXTRA_OECONF = "--without-static-progs \
8 --without-dselect \ 9 --without-dselect \
diff --git a/meta/packages/dpkg/dpkg.inc b/meta/packages/dpkg/dpkg.inc
index 3c3f29c304..0d2053ab0f 100644
--- a/meta/packages/dpkg/dpkg.inc
+++ b/meta/packages/dpkg/dpkg.inc
@@ -1,10 +1,34 @@
1DESCRIPTION = "Package maintenance system for Debian." 1DESCRIPTION = "Package maintenance system for Debian."
2LICENSE = "GPL" 2LICENSE = "GPL"
3SECTION = "base" 3SECTION = "base"
4DEPENDS = "ncurses zlib"
5MAINTAINER = "Chris Larson <kergoth@handhelds.org>" 4MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
6 5
7SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz" 6SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz \
7 file://noupdalt.patch;patch=1"
8S = "${WORKDIR}/dpkg-${PV}" 8S = "${WORKDIR}/dpkg-${PV}"
9 9
10DEPENDS_${PN} += "update-alternatives"
11
10PARALLEL_MAKE = "" 12PARALLEL_MAKE = ""
13
14inherit autotools gettext
15
16DPKG_INIT_POSITION = "98"
17DPKG_INIT_POSITION_slugos = "41"
18
19pkg_postinst_dpkg () {
20#!/bin/sh
21if [ "x$D" != "x" ]; then
22 install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
23 # this happens at S98 where our good 'ole packages script used to run
24 echo -e "#!/bin/sh
25 dpkg --configure -a
26" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
27 chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
28fi
29}
30
31do_configure () {
32 echo >> m4/compiler.m4
33 autotools_do_configure
34}
diff --git a/meta/packages/dpkg/dpkg_1.13.22.bb b/meta/packages/dpkg/dpkg_1.13.22.bb
index 08a9c06fbf..bcf45392b4 100644
--- a/meta/packages/dpkg/dpkg_1.13.22.bb
+++ b/meta/packages/dpkg/dpkg_1.13.22.bb
@@ -1,7 +1,6 @@
1require dpkg.inc 1require dpkg.inc
2DEPENDS += "bzip2" 2PR = "r2"
3 3DEPENDS += "ncurses zlib bzip2"
4inherit autotools gettext
5 4
6EXTRA_OECONF = "--without-static-progs \ 5EXTRA_OECONF = "--without-static-progs \
7 --without-dselect \ 6 --without-dselect \
diff --git a/meta/packages/dpkg/files/nochroot.patch b/meta/packages/dpkg/files/nochroot.patch
new file mode 100644
index 0000000000..3a8beaebbf
--- /dev/null
+++ b/meta/packages/dpkg/files/nochroot.patch
@@ -0,0 +1,18 @@
1---
2 src/help.c | 2 ++
3 1 file changed, 2 insertions(+)
4
5--- dpkg-1.13.22.orig/src/help.c
6+++ dpkg-1.13.22/src/help.c
7@@ -175,9 +175,11 @@ static const char* preexecscript(const c
8 */
9 size_t instdirl;
10
11+#if 0
12 if (*instdir) {
13 if (chroot(instdir)) ohshite(_("failed to chroot to `%.250s'"),instdir);
14 }
15+#endif
16 if (f_debug & dbg_scripts) {
17 fprintf(stderr,"D0%05o: fork/exec %s (",dbg_scripts,path);
18 while (*++argv) fprintf(stderr," %s",*argv);
diff --git a/meta/packages/dpkg/files/noupdalt.patch b/meta/packages/dpkg/files/noupdalt.patch
new file mode 100644
index 0000000000..023e99ae8d
--- /dev/null
+++ b/meta/packages/dpkg/files/noupdalt.patch
@@ -0,0 +1,16 @@
1---
2 scripts/Makefile.am | 3 +--
3 1 file changed, 1 insertion(+), 2 deletions(-)
4
5--- dpkg-1.13.22.orig/scripts/Makefile.am
6+++ dpkg-1.13.22/scripts/Makefile.am
7@@ -20,8 +20,7 @@ bin_SCRIPTS = \
8 sbin_SCRIPTS = \
9 cleanup-info \
10 dpkg-divert \
11- dpkg-statoverride \
12- update-alternatives
13+ dpkg-statoverride
14
15 changelogdir = $(pkglibdir)/parsechangelog
16 changelog_SCRIPTS = \