diff options
Diffstat (limited to 'meta/recipes-devtools')
7 files changed, 10 insertions, 10 deletions
diff --git a/meta/recipes-devtools/apt/apt-native_0.7.14.bb b/meta/recipes-devtools/apt/apt-native_0.7.14.bb index b1bd55b..c82d606 100644 --- a/meta/recipes-devtools/apt/apt-native_0.7.14.bb +++ b/meta/recipes-devtools/apt/apt-native_0.7.14.bb @@ -1,6 +1,6 @@ require apt-native.inc -PR = "r4" +PR = "r5" SRC_URI += "file://nodoc.patch \ file://noconfigure.patch \ diff --git a/meta/recipes-devtools/apt/apt_0.7.14.bb b/meta/recipes-devtools/apt/apt_0.7.14.bb index 1335c16..93eebe9 100644 --- a/meta/recipes-devtools/apt/apt_0.7.14.bb +++ b/meta/recipes-devtools/apt/apt_0.7.14.bb @@ -3,7 +3,7 @@ RDEPENDS_${PN} = "dpkg" LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" require apt.inc -PR = "r7" +PR = "r8" SRC_URI += "file://nodoc.patch \ file://includes-fix.patch " diff --git a/meta/recipes-devtools/apt/files/apt.conf b/meta/recipes-devtools/apt/files/apt.conf index 5732137..ab7a5db 100644 --- a/meta/recipes-devtools/apt/files/apt.conf +++ b/meta/recipes-devtools/apt/files/apt.conf @@ -3,7 +3,7 @@ Dir "${STAGING_DIR_NATIVE}/" State "var/lib/apt/" { Lists "lists/"; - status "#ROOTFS#/var/dpkg/status"; + status "#ROOTFS#/var/lib/dpkg/status"; }; Cache "var/cache/apt/" { @@ -39,5 +39,5 @@ APT }; }; -DPkg::Options {"--root=#ROOTFS#";"--admindir=#ROOTFS#/var/dpkg";"--force-all";"--no-debsig"}; +DPkg::Options {"--root=#ROOTFS#";"--admindir=#ROOTFS#/var/lib/dpkg";"--force-all";"--no-debsig"}; }; diff --git a/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts b/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts index f632d1c..584a92e 100755 --- a/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts +++ b/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts @@ -5,7 +5,7 @@ # Author: Richard Purdie <rpurdie@openedhand.com> # -PKGSYSTEM=/var/dpkg +PKGSYSTEM=/var/lib/dpkg if [ ! -e $PKGSYSTEM/status ]; then if [ -e /usr/lib/opkg/status ]; then diff --git a/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts.awk b/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts.awk index 09a1400..d92200b 100644 --- a/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts.awk +++ b/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts.awk @@ -9,7 +9,7 @@ BEGIN { rc=system("test -d /usr/dpkg/info/") if (rc==0) - pkgdir="/var/dpkg/info" + pkgdir="/var/lib/dpkg/info" else pkgdir="/usr/lib/opkg/info" package="" diff --git a/meta/recipes-devtools/dpkg/run-postinsts_1.0.bb b/meta/recipes-devtools/dpkg/run-postinsts_1.0.bb index f15243b..f8f3368 100644 --- a/meta/recipes-devtools/dpkg/run-postinsts_1.0.bb +++ b/meta/recipes-devtools/dpkg/run-postinsts_1.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Run postinstall scripts on device using awk" SECTION = "devel" -PR = "r6" +PR = "r7" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" diff --git a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc index f7f9ae9..c881ae0 100644 --- a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc +++ b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc @@ -8,7 +8,7 @@ SECTION = "base" SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.bz2" S = "${WORKDIR}/dpkg-${PV}" PACKAGE_ARCH = "all" -INC_PR = "r2" +INC_PR = "r3" inherit gettext @@ -20,7 +20,7 @@ do_patch () { s/^.*$/$D=$ENV{"D"} || ""\;/; p; x; - s,^\$admindir=.*staging.*$,$admindir="$D${localstatedir}/dpkg"\;,; + s,^\$admindir=.*staging.*$,$admindir="$D${localstatedir}/lib/dpkg"\;,; }; s,^\$altdir=.*$,$altdir="$D${sysconfdir}/alternatives"\;,; p;' > ${S}/scripts/update-alternatives @@ -28,7 +28,7 @@ do_patch () { do_install () { install -d ${D}${sbindir} \ - ${D}${localstatedir}/dpkg/alternatives \ + ${D}${localstatedir}/lib/dpkg/alternatives \ ${D}${sysconfdir}/alternatives install -m 0755 scripts/update-alternatives ${D}${sbindir}/update-alternatives |