[oe-commits] org.oe.dev dpkg: sync with poky

[koen commit]

dpkg: sync with poky

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: df1b9d9f654c39e02f0b309e23cce794102e944e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=df1b9d9f654c39e02f0b309e23cce794102e944e
Files:
1
packages/dpkg/dpkg-native_1.13.22.bb
packages/dpkg/dpkg_1.13.22.bb
packages/dpkg/files/nochroot.patch
packages/dpkg/files/noman.patch
packages/dpkg/files/noupdalt.patch
packages/dpkg/dpkg.inc
Diffs:

#
# mt diff -r52221d2041b886c4c8d5dd5beaa69440224431a5 -rdf1b9d9f654c39e02f0b309e23cce794102e944e
#
# 
# 
# add_file "packages/dpkg/dpkg-native_1.13.22.bb"
#  content [2fe73896ce920e74567643674a4ecca45fadabaf]
# 
# add_file "packages/dpkg/dpkg_1.13.22.bb"
#  content [d28be649dd72c17e7fac2cbf69261921f8ff0636]
# 
# add_file "packages/dpkg/files/nochroot.patch"
#  content [96c39aa83c0bb252677018577b751073b25a096d]
# 
# add_file "packages/dpkg/files/noman.patch"
#  content [4546129ebedfbae5cec7be312041166b4124b18b]
# 
# add_file "packages/dpkg/files/noupdalt.patch"
#  content [08e428106de329103ef7bdcb0ea566b61b570377]
# 
# patch "packages/dpkg/dpkg.inc"
#  from [1ec64cea25fef67c0eb210a806f3c23074e2c80d]
#    to [32e4ae943a0df91405e64df6a7288a3cbd9bdc3d]
# 
============================================================
--- packages/dpkg/dpkg-native_1.13.22.bb	2fe73896ce920e74567643674a4ecca45fadabaf
+++ packages/dpkg/dpkg-native_1.13.22.bb	2fe73896ce920e74567643674a4ecca45fadabaf
@@ -0,0 +1,13 @@
+require dpkg.inc
+PR = "r0"
+DEPENDS += "ncurses-native zlib-native virtual/update-alternatives-native"
+SRC_URI += "file://noman.patch;patch=1"
+
+inherit native
+
+EXTRA_OECONF = "--without-static-progs \
+		--without-dselect \
+		--with-start-stop-daemon \
+		--with-zlib \
+		--with-bz2lib \
+		--without-sgml-doc"
============================================================
--- packages/dpkg/dpkg_1.13.22.bb	d28be649dd72c17e7fac2cbf69261921f8ff0636
+++ packages/dpkg/dpkg_1.13.22.bb	d28be649dd72c17e7fac2cbf69261921f8ff0636
@@ -0,0 +1,10 @@
+require dpkg.inc
+PR = "r0"
+DEPENDS += "ncurses zlib bzip2"
+
+EXTRA_OECONF = "--without-static-progs \
+		--without-dselect \
+		--with-start-stop-daemon \
+		--with-zlib \
+		--with-bz2lib \
+		--without-sgml-doc"
============================================================
--- packages/dpkg/files/nochroot.patch	96c39aa83c0bb252677018577b751073b25a096d
+++ packages/dpkg/files/nochroot.patch	96c39aa83c0bb252677018577b751073b25a096d
@@ -0,0 +1,18 @@
+---
+ src/help.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- dpkg-1.13.22.orig/src/help.c
++++ dpkg-1.13.22/src/help.c
+@@ -175,9 +175,11 @@ static const char* preexecscript(const c
+    */
+   size_t instdirl;
+ 
++#if 0
+   if (*instdir) {
+     if (chroot(instdir)) ohshite(_("failed to chroot to `%.250s'"),instdir);
+   }
++#endif
+   if (f_debug & dbg_scripts) {
+     fprintf(stderr,"D0%05o: fork/exec %s (",dbg_scripts,path);
+     while (*++argv) fprintf(stderr," %s",*argv);
============================================================
--- packages/dpkg/files/noman.patch	4546129ebedfbae5cec7be312041166b4124b18b
+++ packages/dpkg/files/noman.patch	4546129ebedfbae5cec7be312041166b4124b18b
@@ -0,0 +1,16 @@
+---
+ Makefile.am |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- dpkg-1.13.22.orig/Makefile.am
++++ dpkg-1.13.22/Makefile.am
+@@ -15,8 +15,7 @@ SUBDIRS = \
+ 	utils \
+ 	scripts \
+ 	po \
+-	origins \
+-	man
++	origins
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
============================================================
--- packages/dpkg/files/noupdalt.patch	08e428106de329103ef7bdcb0ea566b61b570377
+++ packages/dpkg/files/noupdalt.patch	08e428106de329103ef7bdcb0ea566b61b570377
@@ -0,0 +1,16 @@
+---
+ scripts/Makefile.am |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- dpkg-1.13.22.orig/scripts/Makefile.am
++++ dpkg-1.13.22/scripts/Makefile.am
+@@ -20,8 +20,7 @@ bin_SCRIPTS = \
+ sbin_SCRIPTS = \
+ 	cleanup-info \
+ 	dpkg-divert \
+-	dpkg-statoverride \
+-	update-alternatives
++	dpkg-statoverride
+ 
+ changelogdir = $(pkglibdir)/parsechangelog
+ changelog_SCRIPTS = \
============================================================
--- packages/dpkg/dpkg.inc	1ec64cea25fef67c0eb210a806f3c23074e2c80d
+++ packages/dpkg/dpkg.inc	32e4ae943a0df91405e64df6a7288a3cbd9bdc3d
@@ -1,10 +1,34 @@ DEPENDS = "ncurses zlib"
 DESCRIPTION = "Package maintenance system for Debian."
 LICENSE = "GPL"
 SECTION = "base"
 DEPENDS = "ncurses zlib"
+DEPENDS_${PN} += "update-alternatives"
+
 MAINTAINER = "Chris Larson <kergoth at handhelds.org>"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz"
 S = "${WORKDIR}/dpkg-${PV}"
 
 PARALLEL_MAKE = ""
+
+inherit autotools gettext
+
+DPKG_INIT_POSITION = "98"
+DPKG_INIT_POSITION_slugos = "41"
+
+pkg_postinst_dpkg () {
+#!/bin/sh
+if [ "x$D" != "x" ]; then
+	install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
+	# this happens at S98 where our good 'ole packages script used to run
+	echo -e "#!/bin/sh
+	dpkg --configure -a
+" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
+	chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
+fi
+}
+
+do_configure () {
+    echo >> m4/compiler.m4
+    autotools_do_configure
+}