mirror of
https://git.yoctoproject.org/poky
synced 2026-04-21 03:32:12 +02:00
rootfs_deb.bbclass: Use /var/dpkg for dpkg status data
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4511 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
@@ -14,7 +14,7 @@ fakeroot rootfs_deb_do_rootfs () {
|
||||
rm -f ${STAGING_ETCDIR_NATIVE}/apt/preferences
|
||||
> ${IMAGE_ROOTFS}/var/dpkg/status
|
||||
> ${IMAGE_ROOTFS}/var/dpkg/available
|
||||
# > ${STAGING_DIR}/var/dpkg/status
|
||||
mkdir -p ${IMAGE_ROOTFS}/var/dpkg/alternatives
|
||||
|
||||
priority=1
|
||||
for arch in ${PACKAGE_ARCHS}; do
|
||||
@@ -48,8 +48,6 @@ fakeroot rootfs_deb_do_rootfs () {
|
||||
export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS}
|
||||
export OPKG_OFFLINE_ROOT=${IMAGE_ROOTFS}
|
||||
|
||||
mkdir -p ${IMAGE_ROOTFS}/var/lib/dpkg/alternatives
|
||||
|
||||
apt-get update
|
||||
|
||||
_flag () {
|
||||
@@ -110,15 +108,14 @@ fakeroot rootfs_deb_do_rootfs () {
|
||||
|
||||
set -e
|
||||
|
||||
# Hacks to make dpkg/opkg coexist for now
|
||||
mv ${IMAGE_ROOTFS}/var/dpkg ${IMAGE_ROOTFS}/usr/
|
||||
if [ -e ${IMAGE_ROOTFS}/usr/dpkg/alternatives ]; then
|
||||
rmdir ${IMAGE_ROOTFS}/usr/dpkg/alternatives
|
||||
fi
|
||||
# Hacks to allow opkg's update-alternatives and opkg to coexist for now
|
||||
mkdir -p ${IMAGE_ROOTFS}/usr/lib/opkg
|
||||
ln -s /usr/lib/opkg/alternatives ${IMAGE_ROOTFS}/usr/dpkg/alternatives
|
||||
ln -s /usr/dpkg/onfo ${IMAGE_ROOTFS}/usr/lib/opkg/info
|
||||
ln -s /usr/dpkg/status ${IMAGE_ROOTFS}/usr/lib/opkg/status
|
||||
if [ -e ${IMAGE_ROOTFS}/var/dpkg/alternatives ]; then
|
||||
rmdir ${IMAGE_ROOTFS}/var/dpkg/alternatives
|
||||
fi
|
||||
ln -s /usr/lib/opkg/alternatives ${IMAGE_ROOTFS}/var/dpkg/alternatives
|
||||
ln -s /var/dpkg/info ${IMAGE_ROOTFS}/usr/lib/opkg/info
|
||||
ln -s /var/dpkg/status ${IMAGE_ROOTFS}/usr/lib/opkg/status
|
||||
|
||||
${ROOTFS_POSTPROCESS_COMMAND}
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
# Author: Richard Purdie <rpurdie@openedhand.com>
|
||||
#
|
||||
|
||||
PKGSYSTEM=/usr/dpkg
|
||||
PKGSYSTEM=/var/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="/usr/dpkg/info"
|
||||
pkgdir="/var/dpkg/info"
|
||||
else
|
||||
pkgdir="/usr/lib/opkg/info"
|
||||
package=""
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
DESCRIPTION = "Run postinstall scripts on device using awk"
|
||||
SECTION = "devel"
|
||||
PR = "r4"
|
||||
PR = "r6"
|
||||
|
||||
SRC_URI = "file://run-postinsts file://run-postinsts.awk"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user