Skip to contentSkip to conversation

rootfs_rpm.bbclass: make complementary packages not attempt-only

PATCH In review [email protected] 2 participants 4 messages Dec 17, 2013 – Dec 18, 2013

lore
Share & tools
lore
#0 lore raw

cover rootfs_rpm.bbclass: make complementary packages not attempt-only

From: Chen Qi <[email protected]>

The following changes since commit 9daa1de753e58b7f678e68cf307f6028c0c79a6a:

qemu/local.conf.sample: Add sdl PACKAGECONFIG (2013-12-16 12:13:59 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib ChenQi/complementary-attemptonly
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/complementary-attemptonly

Chen Qi (1):
rootfs_rpm.bbclass: make complementary packages not attempt-only

 meta/classes/rootfs_rpm.bbclass |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 rootfs_rpm.bbclass: make complementary packages not attempt-only

From: Chen Qi <[email protected]>

Installing complementary packages should not be attempt-only, otherwise, errors would be hidden. For example, if we enable ptest distro feature, and we add 'ptest-pkgs' to IMAGE_FEATRUES, then building a minimal image would succeed without reporting any error. However, the systemd-ptest is not installed because of lack of the perl package.

---
 meta/classes/rootfs_rpm.bbclass |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/classes/rootfs_rpm.bbclass +2 -2
index 1a0c225..9a88330 100644
@@ -170,8 +170,8 @@ rpm_setup_smart_target_config() {
 
 rootfs_install_packages() {
 	# Note - we expect the variables not set here to already have been set
-	export INSTALL_PACKAGES_RPM=""
-	export INSTALL_PACKAGES_ATTEMPTONLY_RPM="`cat $1`"
+	export INSTALL_PACKAGES_RPM="`cat $1`"
+	export INSTALL_PACKAGES_ATTEMPTONLY_RPM=""
 	export INSTALL_PROVIDENAME_RPM=""
 	export INSTALL_TASK_RPM="rootfs_install_packages"
 	export INSTALL_COMPLEMENTARY_RPM="1"
Signature · 1 line
1.7.9.5
#2 lore raw
Quoted 7 lines · On 12/17/13, 2:54 AM, [email protected] wrote:

From: Chen Qi <[email protected]>

Installing complementary packages should not be attempt-only, otherwise, errors would be hidden. For example, if we enable ptest distro feature, and we add 'ptest-pkgs' to IMAGE_FEATRUES, then building a minimal image would succeed without reporting any error. However, the systemd-ptest is not installed because of lack of the perl package.

Actually that was intentional under the original system design. Any of the complementary packages were just that, complementary and not required for the system to function properly.

If dependencies, installation issues, etc caused problems, we could happily skip them and continue on. There are places (fairly few these days) where the complementary packages are known to introduce a failure, if not ignored.

This happens primarily when the complementary set introduces a package that has a conflict (RCONFLICT or a file level conflict) with something installed in the required set.

--Mark

Quoted 21 lines
---
  meta/classes/rootfs_rpm.bbclass |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
meta/classes/rootfs_rpm.bbclass +2 -2
index 1a0c225..9a88330 100644
@@ -170,8 +170,8 @@ rpm_setup_smart_target_config() {
 
  rootfs_install_packages() {
  	# Note - we expect the variables not set here to already have been set
-	export INSTALL_PACKAGES_RPM=""
-	export INSTALL_PACKAGES_ATTEMPTONLY_RPM="`cat $1`"
+	export INSTALL_PACKAGES_RPM="`cat $1`"
+	export INSTALL_PACKAGES_ATTEMPTONLY_RPM=""
  	export INSTALL_PROVIDENAME_RPM=""
  	export INSTALL_TASK_RPM="rootfs_install_packages"
  	export INSTALL_COMPLEMENTARY_RPM="1"
author
#3 lore raw
Quoted 9 lines · Mark Hatle
Quoted 7 lines · On 12/17/13, 2:54 AM, [email protected] wrote:

From: Chen Qi <[email protected]>

Installing complementary packages should not be attempt-only, otherwise, errors would be hidden. For example, if we enable ptest distro feature, and we add 'ptest-pkgs' to IMAGE_FEATRUES, then building a minimal image would succeed without reporting any error. However, the systemd-ptest is not installed because of lack of the perl package.

Quoted 8 lines

Actually that was intentional under the original system design. Any of the complementary packages were just that, complementary and not required for the system to function properly.

If dependencies, installation issues, etc caused problems, we could happily skip them and continue on. There are places (fairly few these days) where the complementary packages are known to introduce a failure, if not ignored.

This happens primarily when the complementary set introduces a package that has a conflict (RCONFLICT or a file level conflict) with something installed in the required set.

--Mark

Thanks for your explanation :)

Best Regards,
Chen Qi

Quoted 25 lines
Quoted 22 lines
---
  meta/classes/rootfs_rpm.bbclass |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
meta/classes/rootfs_rpm.bbclass +0 -0
index 1a0c225..9a88330 100644
@@ -170,8 +170,8 @@ rpm_setup_smart_target_config() {
 
  rootfs_install_packages() {
      # Note - we expect the variables not set here to already have 

been set

meta/classes/rootfs_rpm.bbclass +2 -2
-    export INSTALL_PACKAGES_RPM=""
-    export INSTALL_PACKAGES_ATTEMPTONLY_RPM="`cat $1`"
+    export INSTALL_PACKAGES_RPM="`cat $1`"
+    export INSTALL_PACKAGES_ATTEMPTONLY_RPM=""
      export INSTALL_PROVIDENAME_RPM=""
      export INSTALL_TASK_RPM="rootfs_install_packages"
      export INSTALL_COMPLEMENTARY_RPM="1"