support yocto compliance

- Move DISTRO_FEATURES pam from layer.conf For installer image, move it to anaconda.conf For target image, append pam to distro feature check and update README, selftest - Remove SRC_DISTRIBUTE_LICENSES and licenses/FLTK Signed-off-by: Hongxu Jia <[email protected]>
WindRiver-Labs · Oct 23, 2018 · e3829d7 · e3829d7
1 parent dd9074a
commit e3829d7
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 539 deletions.
diff --git a/README b/README
@@ -130,9 +130,10 @@ Building the target installer
            $ . <installer-project>/oe-core/oe-init-build-env <target_build>
 
            The build requires 'anaconda-support' in DISTRO_FEATURES to
-           help installation. It also requires RPM packages and systemd
+           help installation. It also requires pam, RPM packages and systemd
            init manager. Edit conf/local.conf to use:
            $ echo 'DISTRO_FEATURES_append = " anaconda-support"' >> conf/local.conf
+           $ echo 'DISTRO_FEATURES_append = " pam"' >> conf/local.conf
            $ echo 'PACKAGE_CLASSES = "package_rpm"' >> conf/local.conf
            $ echo 'VIRTUAL-RUNTIME_init_manager = "systemd"' >> conf/local.conf
            $ echo 'DISTRO_FEATURES_append = " systemd"' >> conf/local.conf

diff --git a/classes/anaconda_support_image.bbclass b/classes/anaconda_support_image.bbclass
@@ -8,7 +8,7 @@ ROOTFS_POSTPROCESS_COMMAND_append = " copy_grub_lib;"
 IMAGE_POSTPROCESS_COMMAND_append = " emit_image_env;"
 
 inherit distro_features_check
-REQUIRED_DISTRO_FEATURES = "systemd ldconfig"
+REQUIRED_DISTRO_FEATURES = "systemd ldconfig pam"
 
 DEPENDS += "grub grub-efi"
 

diff --git a/conf/distro/anaconda.conf b/conf/distro/anaconda.conf
@@ -7,6 +7,7 @@ DISTRO_FEATURES_append = " systemd"
 DISTRO_FEATURES_append = " \
     x11 \
     opengl \
+    pam \
 "
 
 VIRTUAL-RUNTIME_base-utils = "busybox"

diff --git a/conf/layer.conf b/conf/layer.conf
@@ -23,15 +23,8 @@ LAYERDEPENDS_meta-anaconda = " \
     meta-initramfs \
 "
 
-LICENSE_PATH += "${LAYERDIR}/licenses"
-SRC_DISTRIBUTE_LICENSES += "X11"
-SRC_DISTRIBUTE_LICENSES += "FLTK"
-
 LAYER_PATH_meta-anaconda = "${LAYERDIR}"
 
 KERNEL_CLASSES_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'anaconda-support', 'anaconda_support_kernel', '', d)}"
 IMAGE_CLASSES_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'anaconda-support', 'anaconda_support_image', '', d)}"
 
-DISTRO_FEATURES_append = " \
-    pam \
-"
diff --git a/lib/oeqa/selftest/cases/anaconda_oe.py b/lib/oeqa/selftest/cases/anaconda_oe.py
@@ -18,6 +18,7 @@ def setUpLocal(self):
         features += 'PACKAGE_CLASSES = "package_rpm"\n'
         features += 'VIRTUAL-RUNTIME_init_manager = "systemd"\n'
         features += 'DISTRO_FEATURES_append = " systemd"\n'
+        features += 'DISTRO_FEATURES_append = " pam"\n'
         features += 'DISTRO_FEATURES_BACKFILL_CONSIDERED_append = " sysvinit"\n'
         self.write_config(features)
         self.logger.info('local.conf:\n%s' % features)
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ DISTRO_FEATURES_append = " systemd" @@
     DISTRO_FEATURES_append = " \
         x11 \
         opengl \
+        pam \
     "
     VIRTUAL-RUNTIME_base-utils = "busybox"
@@ Expand Down @@