mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 09:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

rootfs_deb.bbclass: Use /var/dpkg for dpkg status data

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4511 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2008-05-20 14:16:48 +00:00
parent 76df5abe0b
commit 6a468efd9a
4 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
meta/classes/rootfs_deb.bbclass
View File

@@ -14,7 +14,7 @@ fakeroot rootfs_deb_do_rootfs () {
rm -f ${STAGING_ETCDIR_NATIVE}/apt/preferences rm -f ${STAGING_ETCDIR_NATIVE}/apt/preferences
> ${IMAGE_ROOTFS}/var/dpkg/status > ${IMAGE_ROOTFS}/var/dpkg/status
> ${IMAGE_ROOTFS}/var/dpkg/available > ${IMAGE_ROOTFS}/var/dpkg/available
# > ${STAGING_DIR}/var/dpkg/status mkdir -p ${IMAGE_ROOTFS}/var/dpkg/alternatives
priority=1 priority=1
for arch in ${PACKAGE_ARCHS}; do for arch in ${PACKAGE_ARCHS}; do
@@ -48,8 +48,6 @@ fakeroot rootfs_deb_do_rootfs () {
export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS} export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS}
export OPKG_OFFLINE_ROOT=${IMAGE_ROOTFS} export OPKG_OFFLINE_ROOT=${IMAGE_ROOTFS}
mkdir -p ${IMAGE_ROOTFS}/var/lib/dpkg/alternatives
apt-get update apt-get update
_flag () { _flag () {
@@ -110,15 +108,14 @@ fakeroot rootfs_deb_do_rootfs () {
set -e set -e
# Hacks to make dpkg/opkg coexist for now # Hacks to allow opkg's update-alternatives and opkg to 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
mkdir -p ${IMAGE_ROOTFS}/usr/lib/opkg mkdir -p ${IMAGE_ROOTFS}/usr/lib/opkg
ln -s /usr/lib/opkg/alternatives ${IMAGE_ROOTFS}/usr/dpkg/alternatives if [ -e ${IMAGE_ROOTFS}/var/dpkg/alternatives ]; then
ln -s /usr/dpkg/onfo ${IMAGE_ROOTFS}/usr/lib/opkg/info rmdir ${IMAGE_ROOTFS}/var/dpkg/alternatives
ln -s /usr/dpkg/status ${IMAGE_ROOTFS}/usr/lib/opkg/status 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} ${ROOTFS_POSTPROCESS_COMMAND}

2
meta/packages/meta/run-postinsts/run-postinsts
View File

@@ -5,7 +5,7 @@
# Author: Richard Purdie <rpurdie@openedhand.com> # Author: Richard Purdie <rpurdie@openedhand.com>
# #
PKGSYSTEM=/usr/dpkg PKGSYSTEM=/var/dpkg
if [ ! -e $PKGSYSTEM/status ]; then if [ ! -e $PKGSYSTEM/status ]; then
if [ -e /usr/lib/opkg/status ]; then if [ -e /usr/lib/opkg/status ]; then

2
meta/packages/meta/run-postinsts/run-postinsts.awk
View File

@@ -9,7 +9,7 @@
BEGIN { BEGIN {
rc=system("test -d /usr/dpkg/info/") rc=system("test -d /usr/dpkg/info/")
if (rc==0) if (rc==0)
pkgdir="/usr/dpkg/info" pkgdir="/var/dpkg/info"
else else
pkgdir="/usr/lib/opkg/info" pkgdir="/usr/lib/opkg/info"
package="" package=""

2
meta/packages/meta/run-postinsts_1.0.bb
View File

@@ -1,6 +1,6 @@
DESCRIPTION = "Run postinstall scripts on device using awk" DESCRIPTION = "Run postinstall scripts on device using awk"
SECTION = "devel" SECTION = "devel"
PR = "r4" PR = "r6"
SRC_URI = "file://run-postinsts file://run-postinsts.awk" SRC_URI = "file://run-postinsts file://run-postinsts.awk"