summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-01-23 16:15:06 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-01-23 16:15:06 +0000
commit7b6ad5b9fb0a004cba5a5ff59004aa795ddf0a87 (patch)
tree999ea988606f1aefa0e1dd414b56b632d9b0718a
parent75f3ca5abb0d7a476a8926f2007bf40782326ce5 (diff)
downloadpoky-7b6ad5b9fb0a004cba5a5ff59004aa795ddf0a87.tar.gz
Fix postinstall scripts not to use IMAGE_ROOTFS direction by use D instead. Based on a patch from Carl Simonson <simonsonc@gmail.com>
-rw-r--r--meta/packages/dpkg/dpkg.inc6
-rw-r--r--meta/packages/modutils/modutils_2.4.27.bb6
-rw-r--r--meta/packages/opkg/opkg_svn.bb6
3 files changed, 9 insertions, 9 deletions
diff --git a/meta/packages/dpkg/dpkg.inc b/meta/packages/dpkg/dpkg.inc
index 041b437abd..67c0781ce8 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 = "r6" 4PR = "r7"
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 \
@@ -19,13 +19,13 @@ DPKG_INIT_POSITION_slugos = "41"
19pkg_postinst_dpkg () { 19pkg_postinst_dpkg () {
20#!/bin/sh 20#!/bin/sh
21if [ "x$D" != "x" ]; then 21if [ "x$D" != "x" ]; then
22 install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d 22 install -d $D/${sysconfdir}/rcS.d
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 rm -f /${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
27" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure 27" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
28 chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure 28 chmod 0755 $D/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
29fi 29fi
30} 30}
31 31
diff --git a/meta/packages/modutils/modutils_2.4.27.bb b/meta/packages/modutils/modutils_2.4.27.bb
index 119e219f7f..a5a9231322 100644
--- a/meta/packages/modutils/modutils_2.4.27.bb
+++ b/meta/packages/modutils/modutils_2.4.27.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "These utilities are intended to make a Linux modular kernel \
3manageable for all users, administrators and distribution maintainers." 3manageable for all users, administrators and distribution maintainers."
4LICENSE = "GPLv2" 4LICENSE = "GPLv2"
5DEPENDS = "bison-native" 5DEPENDS = "bison-native"
6PR = "r8" 6PR = "r9"
7 7
8SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/modutils/v2.4/modutils-${PV}.tar.bz2 \ 8SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/modutils/v2.4/modutils-${PV}.tar.bz2 \
9 file://lex.l.diff;patch=1 \ 9 file://lex.l.diff;patch=1 \
@@ -40,9 +40,9 @@ done
40if test -n "$D"; then 40if test -n "$D"; then
41 D="-r $D" 41 D="-r $D"
42 if test -n "`which ${TARGET_PREFIX}depmod-2.4`"; then 42 if test -n "`which ${TARGET_PREFIX}depmod-2.4`"; then
43 for kerneldir in `ls -p ${IMAGE_ROOTFS}/lib/modules|grep /`; do 43 for kerneldir in `ls -p $D/lib/modules|grep /`; do
44 kernelver=`basename $kerneldir` 44 kernelver=`basename $kerneldir`
45 ${TARGET_PREFIX}depmod-2.4 -a -b ${IMAGE_ROOTFS} -C ${IMAGE_ROOTFS}/${sysconfdir}/modules.conf -r $kernelver 45 ${TARGET_PREFIX}depmod-2.4 -a -b $D -C ${IMAGE_ROOTFS}/${sysconfdir}/modules.conf -r $kernelver
46 done 46 done
47 fi 47 fi
48fi 48fi
diff --git a/meta/packages/opkg/opkg_svn.bb b/meta/packages/opkg/opkg_svn.bb
index 92796a394f..4517cfff1c 100644
--- a/meta/packages/opkg/opkg_svn.bb
+++ b/meta/packages/opkg/opkg_svn.bb
@@ -6,7 +6,7 @@ RCONFLICTS_update-alternatives-cworth = "update-alternatives-dpkg"
6RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}" 6RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}"
7PACKAGE_ARCH_update-alternatives-cworth = "all" 7PACKAGE_ARCH_update-alternatives-cworth = "all"
8 8
9PR = "r8" 9PR = "r9"
10 10
11PACKAGES =+ "libopkg-dev libopkg update-alternatives-cworth" 11PACKAGES =+ "libopkg-dev libopkg update-alternatives-cworth"
12 12
@@ -36,8 +36,8 @@ if [ "x$D" != "x" ]; then
36 echo "#!/bin/sh 36 echo "#!/bin/sh
37opkg-cl configure 37opkg-cl configure
38rm -f /${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure 38rm -f /${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure
39" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure 39" > $D${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure
40 chmod 0755 ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure 40 chmod 0755 $D${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure
41fi 41fi
42 42
43update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100 43update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100