diff options
| -rw-r--r-- | meta/classes/package_deb.bbclass | 4 | ||||
| -rw-r--r-- | meta/classes/package_ipk.bbclass | 1 | ||||
| -rw-r--r-- | meta/classes/poky-image.bbclass | 6 | ||||
| -rw-r--r-- | meta/classes/rootfs_deb.bbclass | 3 | ||||
| -rw-r--r-- | meta/classes/rootfs_ipk.bbclass | 3 | ||||
| -rw-r--r-- | meta/packages/images/poky-image-minimal.bb | 2 | ||||
| -rw-r--r-- | meta/packages/tasks/task-base.bb | 2 | ||||
| -rw-r--r-- | meta/packages/tasks/task-poky-boot.bb | 2 |
8 files changed, 14 insertions, 9 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index ef0eacf44f8..8f5fedada76 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass @@ -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 diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index 4f669aba8e9..f6c71a250dc 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -1,6 +1,5 @@ inherit package -DISTRO_EXTRA_RDEPENDS += "opkg-collateral opkg" IMAGE_PKGTYPE ?= "ipk" IPKGCONF_TARGET = "${STAGING_ETCDIR_NATIVE}/opkg.conf" diff --git a/meta/classes/poky-image.bbclass b/meta/classes/poky-image.bbclass index 41d55279601..8f7daa3ae24 100644 --- a/meta/classes/poky-image.bbclass +++ b/meta/classes/poky-image.bbclass @@ -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 diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass index 467626b2b1e..eb08f4ace4c 100644 --- a/meta/classes/rootfs_deb.bbclass +++ b/meta/classes/rootfs_deb.bbclass @@ -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" diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass index a27688a1acc..8a879680c55 100644 --- a/meta/classes/rootfs_ipk.bbclass +++ b/meta/classes/rootfs_ipk.bbclass @@ -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" diff --git a/meta/packages/images/poky-image-minimal.bb b/meta/packages/images/poky-image-minimal.bb index 1a222fb8c95..e1786929151 100644 --- a/meta/packages/images/poky-image-minimal.bb +++ b/meta/packages/images/poky-image-minimal.bb @@ -1,7 +1,7 @@ # # Copyright (C) 2007 OpenedHand Ltd. # -IMAGE_INSTALL = "task-poky-boot" +IMAGE_INSTALL = "task-poky-boot package-management" IMAGE_LINGUAS = " " diff --git a/meta/packages/tasks/task-base.bb b/meta/packages/tasks/task-base.bb index 19a3a4f9b5b..c2c20ae5a68 100644 --- a/meta/packages/tasks/task-base.bb +++ b/meta/packages/tasks/task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r66" +PR = "r67" inherit task diff --git a/meta/packages/tasks/task-poky-boot.bb b/meta/packages/tasks/task-poky-boot.bb index 22afc84c505..c4821c3f11f 100644 --- a/meta/packages/tasks/task-poky-boot.bb +++ b/meta/packages/tasks/task-poky-boot.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Task for OpenedHand Poky - minimal bootable image" PACKAGE_ARCH = "${MACHINE_ARCH}" DEPENDS = "virtual/kernel" ALLOW_EMPTY = "1" -PR = "r6" +PR = "r7" # # Set by the machine configuration with packages essential for device bootup |