summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-07-03 10:46:27 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-07-03 10:46:27 +0000
commitbca3ead8ab8ca56137ebcce12a9a74c856b4a8d4 (patch)
tree1a2cbf8f4615d480bb27d9ab181357f03938d3bf
parentd44b557f99673d9f9b4eccf574fc621601bd0f43 (diff)
downloadpoky-bca3ead8ab8ca56137ebcce12a9a74c856b4a8d4.tar.gz
dpkg: rm rcS.d/S98configure to not run it on non-first boot
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4795 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/dpkg/dpkg.inc3
-rw-r--r--meta/packages/dpkg/dpkg_1.14.19.bb1
2 files changed, 3 insertions, 1 deletions
diff --git a/meta/packages/dpkg/dpkg.inc b/meta/packages/dpkg/dpkg.inc
index 1a8e7ec9aa..041b437abd 100644
--- a/meta/packages/dpkg/dpkg.inc
+++ b/meta/packages/dpkg/dpkg.inc
@@ -1,7 +1,7 @@
1DESCRIPTION = "Package maintenance system for Debian." 1DESCRIPTION = "Package maintenance system for Debian."
2LICENSE = "GPL" 2LICENSE = "GPL"
3SECTION = "base" 3SECTION = "base"
4PR = "r5" 4PR = "r6"
5 5
6SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz \ 6SRC_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 \
@@ -23,6 +23,7 @@ if [ "x$D" != "x" ]; then
23 # this happens at S98 where our good 'ole packages script used to run 23 # this happens at S98 where our good 'ole packages script used to run
24 echo -e "#!/bin/sh 24 echo -e "#!/bin/sh
25 dpkg --configure -a 25 dpkg --configure -a
26 rm -f /${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
26" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure 27" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
27 chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure 28 chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
28fi 29fi
diff --git a/meta/packages/dpkg/dpkg_1.14.19.bb b/meta/packages/dpkg/dpkg_1.14.19.bb
index b1f84fadf5..1a7991d40e 100644
--- a/meta/packages/dpkg/dpkg_1.14.19.bb
+++ b/meta/packages/dpkg/dpkg_1.14.19.bb
@@ -1,6 +1,7 @@
1require dpkg.inc 1require dpkg.inc
2DEPENDS += "zlib bzip2" 2DEPENDS += "zlib bzip2"
3RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}" 3RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}"
4
4SRC_URI += "file://noman.patch;patch=1" 5SRC_URI += "file://noman.patch;patch=1"
5 6
6EXTRA_OECONF = "--without-static-progs \ 7EXTRA_OECONF = "--without-static-progs \