1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00

deb packages support: switch from /var/dpkg to /var/lib/dpkg

[YOCTO #1086]

The pach was backported from OE:
http://git.openembedded.net/cgit.cgi/openembedded/commit/?id=41e0fbf792037f249d1b8d283b3de81718887c9f

(From OE-Core rev: d1e6f49a6473df3c626100ba01b27485f735c33b)

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Dexuan Cui
2011-09-19 16:00:38 +08:00
committed by Richard Purdie
parent f45ef8d9fa
commit 23773a899b
10 changed files with 27 additions and 27 deletions
@@ -1,6 +1,6 @@
require apt-native.inc
PR = "r4"
PR = "r5"
SRC_URI += "file://nodoc.patch \
file://noconfigure.patch \
+1 -1
View File
@@ -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 "
+2 -2
View File
@@ -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"};
};
@@ -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
@@ -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=""
@@ -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"
@@ -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