mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 13:09:50 +00:00
Code Issues Projects Releases Wiki Activity

poky-image.bbclass: Correctly handle inserting package-managers into images by making it an image feature

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4517 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2008-05-20 14:58:34 +00:00
parent 03c0969ef8
commit bfe8092d3b
8 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/package_deb.bbclass
+1 -3
View File
@@ -1,11 +1,9 @@
#
# Copyright 2006-2007 OpenedHand Ltd.
# Copyright 2006-2008 OpenedHand Ltd.
#
inherit package
BOOTSTRAP_EXTRA_RDEPENDS += "dpkg run-postinsts"
DISTRO_EXTRA_RDEPENDS += "dpkg run-postinsts"
IMAGE_PKGTYPE ?= "deb"
# Map TARGET_ARCH to Debian's ideas about architectures
meta/classes/package_ipk.bbclass
-1
View File
@@ -1,6 +1,5 @@
inherit package
DISTRO_EXTRA_RDEPENDS += "opkg-collateral opkg"
IMAGE_PKGTYPE ?= "ipk"
IPKGCONF_TARGET = "${STAGING_ETCDIR_NATIVE}/opkg.conf"
meta/classes/poky-image.bbclass
+4 -2
View File
@@ -73,12 +73,14 @@ POKY_BASE_INSTALL = '\
${@base_contains("IMAGE_FEATURES", "nfs-server", "task-poky-nfs-server", "",d)} \
${@base_contains("IMAGE_FEATURES", ["nfs-server", "dbg-pkgs"], "task-poky-nfs-server-dbg", "",d)} \
${@base_contains("IMAGE_FEATURES", ["nfs-server", "dev-pkgs"], "task-poky-nfs-server-dev", "",d)} \
\
${@base_contains("IMAGE_FEATURES", "package-management", "${ROOTFS_PKGMANAGE}", "",d)} \
'
IMAGE_INSTALL ?= "${POKY_BASE_INSTALL}"
X11_IMAGE_FEATURES = "x11-base apps-x11-core"
SATO_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-sato apps-x11-games apps-x11-pimlico"
X11_IMAGE_FEATURES = "x11-base apps-x11-core package-management"
SATO_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-sato apps-x11-games apps-x11-pimlico package-management"
inherit image
meta/classes/rootfs_deb.bbclass
+3
View File
@@ -2,6 +2,9 @@
# Copyright 2006-2007 Openedhand Ltd.
#
ROOTFS_PKGMANAGE = "run-postinsts dpkg"
ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts"
do_rootfs[depends] += "dpkg-native:do_populate_staging apt-native:do_populate_staging"
do_rootfs[recrdeptask] += "do_package_write_deb"
meta/classes/rootfs_ipk.bbclass
+3
View File
@@ -5,6 +5,9 @@
# See image.bbclass for a usage of this.
#
ROOTFS_PKGMANAGE = "opkg opkg-collateral"
ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts"
do_rootfs[depends] += "opkg-native:do_populate_staging ipkg-utils-native:do_populate_staging"
do_rootfs[recrdeptask] += "do_package_write_ipk"