summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/apt/apt-native_0.7.14.bb2
-rw-r--r--meta/recipes-devtools/apt/apt_0.7.14.bb2
-rw-r--r--meta/recipes-devtools/apt/files/apt.conf4
-rwxr-xr-xmeta/recipes-devtools/dpkg/run-postinsts/run-postinsts2
-rw-r--r--meta/recipes-devtools/dpkg/run-postinsts/run-postinsts.awk2
-rw-r--r--meta/recipes-devtools/dpkg/run-postinsts_1.0.bb2
-rw-r--r--meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc6
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 b1bd55b2cf..c82d606ebe 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 @@
1require apt-native.inc 1require apt-native.inc
2 2
3PR = "r4" 3PR = "r5"
4 4
5SRC_URI += "file://nodoc.patch \ 5SRC_URI += "file://nodoc.patch \
6 file://noconfigure.patch \ 6 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 1335c16495..93eebe9502 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"
3LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" 3LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3"
4require apt.inc 4require apt.inc
5 5
6PR = "r7" 6PR = "r8"
7 7
8SRC_URI += "file://nodoc.patch \ 8SRC_URI += "file://nodoc.patch \
9 file://includes-fix.patch " 9 file://includes-fix.patch "
diff --git a/meta/recipes-devtools/apt/files/apt.conf b/meta/recipes-devtools/apt/files/apt.conf
index 5732137ccb..ab7a5db492 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}/"
3 State "var/lib/apt/" 3 State "var/lib/apt/"
4 { 4 {
5 Lists "lists/"; 5 Lists "lists/";
6 status "#ROOTFS#/var/dpkg/status"; 6 status "#ROOTFS#/var/lib/dpkg/status";
7 }; 7 };
8 Cache "var/cache/apt/" 8 Cache "var/cache/apt/"
9 { 9 {
@@ -39,5 +39,5 @@ APT
39 }; 39 };
40}; 40};
41 41
42DPkg::Options {"--root=#ROOTFS#";"--admindir=#ROOTFS#/var/dpkg";"--force-all";"--no-debsig"}; 42DPkg::Options {"--root=#ROOTFS#";"--admindir=#ROOTFS#/var/lib/dpkg";"--force-all";"--no-debsig"};
43}; 43};
diff --git a/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts b/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts
index f632d1c7d3..584a92ebfd 100755
--- a/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts
+++ b/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts
@@ -5,7 +5,7 @@
5# Author: Richard Purdie <rpurdie@openedhand.com> 5# Author: Richard Purdie <rpurdie@openedhand.com>
6# 6#
7 7
8PKGSYSTEM=/var/dpkg 8PKGSYSTEM=/var/lib/dpkg
9 9
10if [ ! -e $PKGSYSTEM/status ]; then 10if [ ! -e $PKGSYSTEM/status ]; then
11 if [ -e /usr/lib/opkg/status ]; then 11 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 09a1400cf4..d92200b4f0 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 @@
9BEGIN { 9BEGIN {
10 rc=system("test -d /usr/dpkg/info/") 10 rc=system("test -d /usr/dpkg/info/")
11 if (rc==0) 11 if (rc==0)
12 pkgdir="/var/dpkg/info" 12 pkgdir="/var/lib/dpkg/info"
13 else 13 else
14 pkgdir="/usr/lib/opkg/info" 14 pkgdir="/usr/lib/opkg/info"
15 package="" 15 package=""
diff --git a/meta/recipes-devtools/dpkg/run-postinsts_1.0.bb b/meta/recipes-devtools/dpkg/run-postinsts_1.0.bb
index f15243b60a..f8f3368729 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 @@
1DESCRIPTION = "Run postinstall scripts on device using awk" 1DESCRIPTION = "Run postinstall scripts on device using awk"
2SECTION = "devel" 2SECTION = "devel"
3PR = "r6" 3PR = "r7"
4LICENSE = "MIT" 4LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 5LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
6 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 6 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 f7f9ae979d..c881ae0219 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"
8SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.bz2" 8SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.bz2"
9S = "${WORKDIR}/dpkg-${PV}" 9S = "${WORKDIR}/dpkg-${PV}"
10PACKAGE_ARCH = "all" 10PACKAGE_ARCH = "all"
11INC_PR = "r2" 11INC_PR = "r3"
12 12
13inherit gettext 13inherit gettext
14 14
@@ -20,7 +20,7 @@ do_patch () {
20 s/^.*$/$D=$ENV{"D"} || ""\;/; 20 s/^.*$/$D=$ENV{"D"} || ""\;/;
21 p; 21 p;
22 x; 22 x;
23 s,^\$admindir=.*staging.*$,$admindir="$D${localstatedir}/dpkg"\;,; 23 s,^\$admindir=.*staging.*$,$admindir="$D${localstatedir}/lib/dpkg"\;,;
24 }; 24 };
25 s,^\$altdir=.*$,$altdir="$D${sysconfdir}/alternatives"\;,; 25 s,^\$altdir=.*$,$altdir="$D${sysconfdir}/alternatives"\;,;
26 p;' > ${S}/scripts/update-alternatives 26 p;' > ${S}/scripts/update-alternatives
@@ -28,7 +28,7 @@ do_patch () {
28 28
29do_install () { 29do_install () {
30 install -d ${D}${sbindir} \ 30 install -d ${D}${sbindir} \
31 ${D}${localstatedir}/dpkg/alternatives \ 31 ${D}${localstatedir}/lib/dpkg/alternatives \
32 ${D}${sysconfdir}/alternatives 32 ${D}${sysconfdir}/alternatives
33 33
34 install -m 0755 scripts/update-alternatives ${D}${sbindir}/update-alternatives 34 install -m 0755 scripts/update-alternatives ${D}${sbindir}/update-alternatives