summaryrefslogtreecommitdiff
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)
downloadopenembedded-core-bca3ead8ab8ca56137ebcce12a9a74c856b4a8d4.tar.gz
openembedded-core-bca3ead8ab8ca56137ebcce12a9a74c856b4a8d4.tar.bz2
openembedded-core-bca3ead8ab8ca56137ebcce12a9a74c856b4a8d4.tar.xz
openembedded-core-bca3ead8ab8ca56137ebcce12a9a74c856b4a8d4.zip
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 1a8e7ec9a..041b437ab 100644
--- a/meta/packages/dpkg/dpkg.inc
+++ b/meta/packages/dpkg/dpkg.inc
@@ -1,7 +1,7 @@
DESCRIPTION = "Package maintenance system for Debian."
LICENSE = "GPL"
SECTION = "base"
-PR = "r5"
+PR = "r6"
SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz \
file://ignore_extra_fields.patch;patch=1 \
@@ -23,6 +23,7 @@ if [ "x$D" != "x" ]; then
# this happens at S98 where our good 'ole packages script used to run
echo -e "#!/bin/sh
dpkg --configure -a
+ rm -f /${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
fi
diff --git a/meta/packages/dpkg/dpkg_1.14.19.bb b/meta/packages/dpkg/dpkg_1.14.19.bb
index b1f84fadf..1a7991d40 100644
--- a/meta/packages/dpkg/dpkg_1.14.19.bb
+++ b/meta/packages/dpkg/dpkg_1.14.19.bb
@@ -1,6 +1,7 @@
require dpkg.inc
DEPENDS += "zlib bzip2"
RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}"
+
SRC_URI += "file://noman.patch;patch=1"
EXTRA_OECONF = "--without-static-progs \