diff options
| -rw-r--r-- | meta/packages/dpkg/dpkg.inc | 6 | ||||
| -rw-r--r-- | meta/packages/modutils/modutils_2.4.27.bb | 6 | ||||
| -rw-r--r-- | meta/packages/opkg/opkg_svn.bb | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/meta/packages/dpkg/dpkg.inc b/meta/packages/dpkg/dpkg.inc index 041b437ab..67c0781ce 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 = "r6" +PR = "r7" SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz \ file://ignore_extra_fields.patch;patch=1 \ @@ -19,13 +19,13 @@ DPKG_INIT_POSITION_slugos = "41" pkg_postinst_dpkg () { #!/bin/sh if [ "x$D" != "x" ]; then - install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d + install -d $D/${sysconfdir}/rcS.d # 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 + chmod 0755 $D/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure fi } diff --git a/meta/packages/modutils/modutils_2.4.27.bb b/meta/packages/modutils/modutils_2.4.27.bb index 119e219f7..a5a923132 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 \ manageable for all users, administrators and distribution maintainers." LICENSE = "GPLv2" DEPENDS = "bison-native" -PR = "r8" +PR = "r9" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/modutils/v2.4/modutils-${PV}.tar.bz2 \ file://lex.l.diff;patch=1 \ @@ -40,9 +40,9 @@ done if test -n "$D"; then D="-r $D" if test -n "`which ${TARGET_PREFIX}depmod-2.4`"; then - for kerneldir in `ls -p ${IMAGE_ROOTFS}/lib/modules|grep /`; do + for kerneldir in `ls -p $D/lib/modules|grep /`; do kernelver=`basename $kerneldir` - ${TARGET_PREFIX}depmod-2.4 -a -b ${IMAGE_ROOTFS} -C ${IMAGE_ROOTFS}/${sysconfdir}/modules.conf -r $kernelver + ${TARGET_PREFIX}depmod-2.4 -a -b $D -C ${IMAGE_ROOTFS}/${sysconfdir}/modules.conf -r $kernelver done fi fi diff --git a/meta/packages/opkg/opkg_svn.bb b/meta/packages/opkg/opkg_svn.bb index 92796a394..4517cfff1 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" RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}" PACKAGE_ARCH_update-alternatives-cworth = "all" -PR = "r8" +PR = "r9" PACKAGES =+ "libopkg-dev libopkg update-alternatives-cworth" @@ -36,8 +36,8 @@ if [ "x$D" != "x" ]; then echo "#!/bin/sh opkg-cl configure rm -f /${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure -" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure - chmod 0755 ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure +" > $D${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure + chmod 0755 $D${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure fi update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100 |