diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2021-02-13 00:55:30 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2021-02-25 23:15:06 +0300 |
commit | 706d5aacd7ab7b37c00df1a1b210e4ced06119e1 (patch) | |
tree | ed0bec373424d01accfb2e9c895c177a3e2d7abe /poky/meta/recipes-core/sysvinit | |
parent | ac970dd705934286df062e0f1501f776dc2ef01d (diff) | |
download | openbmc-706d5aacd7ab7b37c00df1a1b210e4ced06119e1.tar.xz |
Reset poky to before our libpam hacks
Things got a bit out of synch with openbmc-config due to the libpam
issues and the migration from the meta-* layers.
Revert the two previous commits and then put the latest poky in with the
libpam revert and get openbmc-config right again.
Revert "Revert "libpam: update 1.3.1 -> 1.5.1""
This reverts commit 87ddd3eab4df68e624b5350ccaab28b3b97547c0.
Revert "poky: subtree update:796be0593a..10c69538c0"
This reverts commit c723b72979bfac6362509cf1fe086900f6641f28.
Change-Id: I3a1f405193aee6a21fe0cd24be9927c143a23d9a
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'poky/meta/recipes-core/sysvinit')
-rwxr-xr-x | poky/meta/recipes-core/sysvinit/sysvinit/rc | 9 | ||||
-rw-r--r-- | poky/meta/recipes-core/sysvinit/sysvinit/rcS-default | 7 | ||||
-rw-r--r-- | poky/meta/recipes-core/sysvinit/sysvinit_2.97.bb (renamed from poky/meta/recipes-core/sysvinit/sysvinit_2.98.bb) | 9 |
3 files changed, 5 insertions, 20 deletions
diff --git a/poky/meta/recipes-core/sysvinit/sysvinit/rc b/poky/meta/recipes-core/sysvinit/sysvinit/rc index 41196ec90b..d0d3149821 100755 --- a/poky/meta/recipes-core/sysvinit/sysvinit/rc +++ b/poky/meta/recipes-core/sysvinit/sysvinit/rc @@ -17,7 +17,6 @@ . /etc/default/rcS export VERBOSE -export PSPLASH_FIFO_DIR startup_progress() { step=$(($step + $step_change)) @@ -28,7 +27,7 @@ startup_progress() { fi #echo "PROGRESS is $progress $runlevel $first_step + ($step of $num_steps) $step_change $progress_size" if type psplash-write >/dev/null 2>&1; then - psplash-write "PROGRESS $progress" || true + PSPLASH_FIFO_DIR=/mnt/.psplash psplash-write "PROGRESS $progress" || true fi } @@ -160,9 +159,6 @@ startup() { # [ -f $previous_start ] && [ ! -f $stop ] && continue fi - if [ x"${PSPLASH_TEXT_UPDATES}" = x"yes" ]; then - psplash-write "MSG $(basename $i .sh | cut -c 4-)" || true - fi case "$runlevel" in 0|6) startup $i stop @@ -177,6 +173,7 @@ startup() { #Uncomment to cause psplash to exit manually, otherwise it exits when it sees a VC switch if [ "x$runlevel" != "xS" ] && [ ! -x /etc/rc${runlevel}.d/S??xserver-nodm ]; then if type psplash-write >/dev/null 2>&1; then - psplash-write "QUIT" || true + PSPLASH_FIFO_DIR=/mnt/.psplash psplash-write "QUIT" || true + umount -l /mnt/.psplash fi fi diff --git a/poky/meta/recipes-core/sysvinit/sysvinit/rcS-default b/poky/meta/recipes-core/sysvinit/sysvinit/rcS-default index f7c4a2f841..709cdf6ec5 100644 --- a/poky/meta/recipes-core/sysvinit/sysvinit/rcS-default +++ b/poky/meta/recipes-core/sysvinit/sysvinit/rcS-default @@ -27,10 +27,3 @@ VOLATILE_ENABLE_CACHE=yes # Setting ROOTFS_READ_ONLY to yes and rebooting will give you a read-only rootfs. # Normally you should not change this value. ROOTFS_READ_ONLY=no -# rcS is also used when using busybox init and shares initscripts, some initscripts -# need to have specific behavior depending on init system -INIT_SYSTEM=sysvinit -# set the psplash fifo directory -PSPLASH_FIFO_DIR=/mnt -# psplash textual updates knob -PSPLASH_TEXT_UPDATES=#PSPLASH_TEXT# diff --git a/poky/meta/recipes-core/sysvinit/sysvinit_2.98.bb b/poky/meta/recipes-core/sysvinit/sysvinit_2.97.bb index 41009bc180..98916f7f19 100644 --- a/poky/meta/recipes-core/sysvinit/sysvinit_2.98.bb +++ b/poky/meta/recipes-core/sysvinit/sysvinit_2.97.bb @@ -21,7 +21,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.xz \ file://bootlogd.init \ file://01_bootlogd \ " -SRC_URI[sha256sum] = "7b2c3ffaf19eaf1ca80268762f85f9e4eb8e3c973213d49f9802605b72caa7dc" +SRC_URI[sha256sum] = "2d5996857519bfd8634d2e1debabb3238fb38440f65fbfdc46420ee8bdf25110" S = "${WORKDIR}/sysvinit-${PV}" @@ -29,8 +29,6 @@ inherit update-alternatives features_check DEPENDS_append = " update-rc.d-native base-passwd virtual/crypt" do_package_setscene[depends] = "${MLPREFIX}base-passwd:do_populate_sysroot" -PACKAGECONFIG[psplash-text-updates] = ",," - REQUIRED_DISTRO_FEATURES = "sysvinit" ALTERNATIVE_${PN} = "init mountpoint halt reboot runlevel shutdown poweroff last lastb mesg utmpdump wall" @@ -93,10 +91,7 @@ do_install () { install -d ${D}${sysconfdir}/rc$level.d done - sed -e \ - 's:#PSPLASH_TEXT#:${@bb.utils.contains("PACKAGECONFIG","psplash-text-updates","yes","no", d)}:g' \ - ${WORKDIR}/rcS-default > ${D}${sysconfdir}/default/rcS - chmod 0644 ${D}${sysconfdir}/default/rcS + install -m 0644 ${WORKDIR}/rcS-default ${D}${sysconfdir}/default/rcS install -m 0755 ${WORKDIR}/rc ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/bootlogd.init ${D}${sysconfdir}/init.d/bootlogd |