obmc-phosphor-image: move rootfs cmds to recipe
Similar to IMAGE_FEATURES, move the rootfs modifications to the image
recipe to open up the possibility of other image recipes using
obmc-phosphor-image.bbclass. Leave the rootfs command definitions in
the class for use by other image recipes.
(From meta-phosphor rev: 1e92fefdf8c8da253a4ed0ae35256af7592da0b6)
Change-Id: I814f73e24fda19c7fd5393252b660b20079e66c7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass
index 079495b..797aab08 100644
--- a/meta-phosphor/classes/obmc-phosphor-image.bbclass
+++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass
@@ -69,21 +69,11 @@
OBMC_IMAGE_EXTRA_INSTALL ?= ""
-# The /etc/version file is misleading and not useful. Remove it.
-# Users should instead rely on /etc/os-release.
remove_etc_version() {
rm ${IMAGE_ROOTFS}${sysconfdir}/version
}
-ROOTFS_POSTPROCESS_COMMAND += "remove_etc_version ; "
-# Disable the pager to prevent systemd injecting control characters into the
-# output stream that are not interpreted by busybox tools.
disable_systemd_pager() {
echo "SYSTEMD_PAGER=" >> ${IMAGE_ROOTFS}${sysconfdir}/profile
echo "export SYSTEMD_PAGER" >> ${IMAGE_ROOTFS}${sysconfdir}/profile
}
-ROOTFS_POSTPROCESS_COMMAND += "disable_systemd_pager ; "
-
-# The shadow recipe provides the binaries(like useradd, usermod) needed by the
-# phosphor-user-manager.
-ROOTFS_RO_UNNEEDED_remove = "shadow"
diff --git a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb
index d224d70..9c0f87b 100644
--- a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb
+++ b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb
@@ -32,3 +32,15 @@
"
inherit obmc-phosphor-image
+
+# The /etc/version file is misleading and not useful. Remove it.
+# Users should instead rely on /etc/os-release.
+ROOTFS_POSTPROCESS_COMMAND += "remove_etc_version ; "
+
+# Disable the pager to prevent systemd injecting control characters into the
+# output stream that are not interpreted by busybox tools.
+ROOTFS_POSTPROCESS_COMMAND += "disable_systemd_pager ; "
+
+# The shadow recipe provides the binaries(like useradd, usermod) needed by the
+# phosphor-user-manager.
+ROOTFS_RO_UNNEEDED_remove = "shadow"