From 86a246c6697a4c704f83a972d8e428873ada904a Mon Sep 17 00:00:00 2001 From: Captain Date: Fri, 3 Jul 2015 20:08:04 +0200 Subject: [PATCH] fix next merge issues --- meta-oe/conf/distro/openatv.conf | 2 +- .../action_wpa.sh | 0 .../functions.sh | 0 .../ifupdown.sh | 0 .../wpa_action | 0 .../wpa_action.8 | 0 .../sysvinit/sysvinit/proc_progress.patch | 16 -- .../sysvinit/sysvinit/proc_progress_ini.patch | 13 -- .../sysvinit/proc_progress_vuplus.patch | 13 -- .../sysvinit/sysvinit/proc_progressgb.patch | 16 -- .../sysvinit/proc_progressgbplus.patch | 13 -- meta-oe/recipes-core/sysvinit/sysvinit/rc | 188 ++++++++++++++++++ .../sysvinit/sysvinit_2.88dsf.bbappend | 5 +- 13 files changed, 190 insertions(+), 76 deletions(-) rename meta-oe/recipes-connectivity/wpa-supplicant/{wpa-supplicant-2.3 => wpa-supplicant-2.4}/action_wpa.sh (100%) rename meta-oe/recipes-connectivity/wpa-supplicant/{wpa-supplicant-2.3 => wpa-supplicant-2.4}/functions.sh (100%) rename meta-oe/recipes-connectivity/wpa-supplicant/{wpa-supplicant-2.3 => wpa-supplicant-2.4}/ifupdown.sh (100%) rename meta-oe/recipes-connectivity/wpa-supplicant/{wpa-supplicant-2.3 => wpa-supplicant-2.4}/wpa_action (100%) rename meta-oe/recipes-connectivity/wpa-supplicant/{wpa-supplicant-2.3 => wpa-supplicant-2.4}/wpa_action.8 (100%) delete mode 100644 meta-oe/recipes-core/sysvinit/sysvinit/proc_progress.patch delete mode 100644 meta-oe/recipes-core/sysvinit/sysvinit/proc_progress_ini.patch delete mode 100644 meta-oe/recipes-core/sysvinit/sysvinit/proc_progress_vuplus.patch delete mode 100644 meta-oe/recipes-core/sysvinit/sysvinit/proc_progressgb.patch delete mode 100644 meta-oe/recipes-core/sysvinit/sysvinit/proc_progressgbplus.patch create mode 100644 meta-oe/recipes-core/sysvinit/sysvinit/rc diff --git a/meta-oe/conf/distro/openatv.conf b/meta-oe/conf/distro/openatv.conf index 5d05fbd6803..bd5f60b3fb9 100644 --- a/meta-oe/conf/distro/openatv.conf +++ b/meta-oe/conf/distro/openatv.conf @@ -78,7 +78,7 @@ PREFERRED_VERSION_udev ?= "182" PREFERRED_VERSION_netatalk ?= "2.2.3" -DISTRO_FEATURES ?= "x11 alsa argp bluetooth ext2 irda largefile pcmcia wifi wifi-extra xattr nfs appletalk smbfs zeroconf pci ${DISTRO_FEATURES_LIBC} pam no-autobouquetsmaker" +DISTRO_FEATURES ?= "pulseaudio x11 alsa argp bluetooth ext2 irda largefile pcmcia wifi wifi-extra xattr nfs appletalk smbfs zeroconf pci ${DISTRO_FEATURES_LIBC} pam no-autobouquetsmaker" QA_LOG = "1" QA_LOGFILE = "${TMPDIR}/qa.log" diff --git a/meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.3/action_wpa.sh b/meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.4/action_wpa.sh similarity index 100% rename from meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.3/action_wpa.sh rename to meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.4/action_wpa.sh diff --git a/meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.3/functions.sh b/meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.4/functions.sh similarity index 100% rename from meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.3/functions.sh rename to meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.4/functions.sh diff --git a/meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.3/ifupdown.sh b/meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.4/ifupdown.sh similarity index 100% rename from meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.3/ifupdown.sh rename to meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.4/ifupdown.sh diff --git a/meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.3/wpa_action b/meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.4/wpa_action similarity index 100% rename from meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.3/wpa_action rename to meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.4/wpa_action diff --git a/meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.3/wpa_action.8 b/meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.4/wpa_action.8 similarity index 100% rename from meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.3/wpa_action.8 rename to meta-oe/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.4/wpa_action.8 diff --git a/meta-oe/recipes-core/sysvinit/sysvinit/proc_progress.patch b/meta-oe/recipes-core/sysvinit/sysvinit/proc_progress.patch deleted file mode 100644 index f9560e6c6be..00000000000 --- a/meta-oe/recipes-core/sysvinit/sysvinit/proc_progress.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/../rc 2013-05-07 15:04:31.964626327 +0100 -+++ b/../rc 2013-05-07 15:04:20.388625248 +0100 -@@ -26,11 +26,8 @@ - progress=$progress_size - 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 -- # TMPDIR=/mnt/.psplash psplash-write "PROGRESS $progress" || true -- #fi -- if [ -e /mnt/.psplash/psplash_fifo ]; then -- echo "PROGRESS $progress" > /mnt/.psplash/psplash_fifo -+ if [ $progress -gt 0 -a -e /proc/progress ]; then -+ echo $(($progress / 2)) > /proc/progress - fi - } - diff --git a/meta-oe/recipes-core/sysvinit/sysvinit/proc_progress_ini.patch b/meta-oe/recipes-core/sysvinit/sysvinit/proc_progress_ini.patch deleted file mode 100644 index 089ff8984f6..00000000000 --- a/meta-oe/recipes-core/sysvinit/sysvinit/proc_progress_ini.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/../rc 2013-05-07 15:04:31.964626327 +0100 -+++ b/../rc 2013-05-07 15:04:20.388625248 +0100 -@@ -26,8 +26,8 @@ - progress=$progress_size - fi - #echo "PROGRESS is $progress $runlevel $first_step + ($step of $num_steps) $step_change $progress_size" -- if [ $progress -gt 0 -a -e /proc/progress ]; then -- echo $(($progress / 2)) > /proc/progress -+ if [ $progress -gt 0 -a -e /proc/vfd ]; then -+ echo Loading $(($progress / 2)) % > /proc/vfd - fi - } - diff --git a/meta-oe/recipes-core/sysvinit/sysvinit/proc_progress_vuplus.patch b/meta-oe/recipes-core/sysvinit/sysvinit/proc_progress_vuplus.patch deleted file mode 100644 index d20e17526fb..00000000000 --- a/meta-oe/recipes-core/sysvinit/sysvinit/proc_progress_vuplus.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/../rc 2013-05-07 15:04:31.964626327 +0100 -+++ b/../rc 2013-05-07 15:04:20.388625248 +0100 -@@ -26,8 +26,8 @@ - progress=$progress_size - fi - #echo "PROGRESS is $progress $runlevel $first_step + ($step of $num_steps) $step_change $progress_size" -- if [ $progress -gt 0 -a -e /proc/progress ]; then -- echo $(($progress / 2)) > /proc/progress -+ if [ $progress -gt 0 -a -e /usr/bin/displayvfd ]; then -+ displayvfd -s 18 -t "Booting $progress" - fi - } - diff --git a/meta-oe/recipes-core/sysvinit/sysvinit/proc_progressgb.patch b/meta-oe/recipes-core/sysvinit/sysvinit/proc_progressgb.patch deleted file mode 100644 index 46507960d63..00000000000 --- a/meta-oe/recipes-core/sysvinit/sysvinit/proc_progressgb.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/../rc 2013-05-07 15:04:31.964626327 +0100 -+++ b/../rc 2013-05-07 15:04:20.388625248 +0100 -@@ -26,11 +26,8 @@ - progress=$progress_size - 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 -- # TMPDIR=/mnt/.psplash psplash-write "PROGRESS $progress" || true -- #fi -- if [ -e /mnt/.psplash/psplash_fifo ]; then -- echo "PROGRESS $progress" > /mnt/.psplash/psplash_fifo -+ if [ $progress -gt 0 -a -e /dev/dbox/oled0 ]; then -+ echo $(($progress / 2)) > /dev/dbox/oled0 - fi - } - diff --git a/meta-oe/recipes-core/sysvinit/sysvinit/proc_progressgbplus.patch b/meta-oe/recipes-core/sysvinit/sysvinit/proc_progressgbplus.patch deleted file mode 100644 index 44d87b4e184..00000000000 --- a/meta-oe/recipes-core/sysvinit/sysvinit/proc_progressgbplus.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/../rc 2013-05-07 15:04:31.964626327 +0100 -+++ b/../rc 2013-05-07 15:04:20.388625248 +0100 -@@ -26,8 +26,8 @@ - progress=$progress_size - fi - #echo "PROGRESS is $progress $runlevel $first_step + ($step of $num_steps) $step_change $progress_size" -- if [ $progress -gt 0 -a -e /proc/progress ]; then -- echo $(($progress / 2)) > /proc/progress -+ if [ $progress -gt 0 -a -e /dev/mcu ]; then -+ echo $(($progress / 2)) > /dev/mcu - fi - } - diff --git a/meta-oe/recipes-core/sysvinit/sysvinit/rc b/meta-oe/recipes-core/sysvinit/sysvinit/rc new file mode 100644 index 00000000000..d3eac57c93e --- /dev/null +++ b/meta-oe/recipes-core/sysvinit/sysvinit/rc @@ -0,0 +1,188 @@ +#!/bin/sh +# +# rc This file is responsible for starting/stopping +# services when the runlevel changes. +# +# Optimization feature: +# A startup script is _not_ run when the service was +# running in the previous runlevel and it wasn't stopped +# in the runlevel transition (most Debian services don't +# have K?? links in rc{1,2,3,4,5} ) +# +# Author: Miquel van Smoorenburg +# Bruce Perens +# +# Version: @(#)rc 2.78 07-Nov-1999 miquels@cistron.nl +# + +. /etc/default/rcS +export VERBOSE + +startup_progress() { + step=$(($step + $step_change)) + if [ "$num_steps" != "0" ]; then + progress=$((($step * $progress_size / $num_steps) + $first_step)) + else + progress=$progress_size + 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 + # TMPDIR=/mnt/.psplash psplash-write "PROGRESS $progress" || true + #fi + if [ $progress -gt 0 -a -e /proc/progress ]; then + echo $(($progress / 2)) > /proc/progress + elif [ $progress -gt 0 -a -e /proc/vfd ]; then + echo Loading $(($progress / 2)) % > /proc/vfd + elif [ $progress -gt 0 -a -e /usr/bin/displayvfd ]; then + displayvfd -s 18 -t "Booting $progress" + elif [ $progress -gt 0 -a -e /dev/mcu ]; then + echo $(($progress / 2)) > /dev/mcu + fi +} + + +# +# Start script or program. +# +startup() { + # Handle verbosity + [ "$VERBOSE" = very ] && echo "INIT: Running $@..." + + case "$1" in + *.sh) + # Source shell script for speed. + ( + trap - INT QUIT TSTP + scriptname=$1 + shift + . $scriptname + ) + ;; + *) + "$@" + ;; + esac + startup_progress +} + + # Ignore CTRL-C only in this shell, so we can interrupt subprocesses. + trap ":" INT QUIT TSTP + + # Set onlcr to avoid staircase effect. + stty onlcr 0>&1 + + # Limit stack size for startup scripts + [ "$STACK_SIZE" == "" ] || ulimit -S -s $STACK_SIZE + + # Now find out what the current and what the previous runlevel are. + + runlevel=$RUNLEVEL + # Get first argument. Set new runlevel to this argument. + [ "$1" != "" ] && runlevel=$1 + if [ "$runlevel" = "" ] + then + echo "Usage: $0 " >&2 + exit 1 + fi + previous=$PREVLEVEL + [ "$previous" = "" ] && previous=N + + export runlevel previous + + # Is there an rc directory for this new runlevel? + if [ -d /etc/rc$runlevel.d ] + then + # Find out where in the progress bar the initramfs got to. + PROGRESS_STATE=0 + #if [ -f /dev/.initramfs/progress_state ]; then + # . /dev/.initramfs/progress_state + #fi + + # Split the remaining portion of the progress bar into thirds + progress_size=$(((100 - $PROGRESS_STATE) / 3)) + + case "$runlevel" in + 0|6) + # Count down from -100 to 0 and use the entire bar + first_step=-100 + progress_size=100 + step_change=1 + ;; + S) + # Begin where the initramfs left off and use 2/3 + # of the remaining space + first_step=$PROGRESS_STATE + progress_size=$(($progress_size * 2)) + step_change=1 + ;; + *) + # Begin where rcS left off and use the final 1/3 of + # the space (by leaving progress_size unchanged) + first_step=$(($progress_size * 2 + $PROGRESS_STATE)) + step_change=1 + ;; + esac + + num_steps=0 + for s in /etc/rc$runlevel.d/[SK]*; do + case "${s##/etc/rc$runlevel.d/S??}" in + gdm|xdm|kdm|reboot|halt) + break + ;; + esac + num_steps=$(($num_steps + 1)) + done + step=0 + + # First, run the KILL scripts. + if [ $previous != N ] + then + for i in /etc/rc$runlevel.d/K[0-9][0-9]* + do + # Check if the script is there. + [ ! -f $i ] && continue + + # Stop the service. + startup $i stop + done + fi + + # Now run the START scripts for this runlevel. + for i in /etc/rc$runlevel.d/S* + do + [ ! -f $i ] && continue + + if [ $previous != N ] && [ $previous != S ] + then + # + # Find start script in previous runlevel and + # stop script in this runlevel. + # + suffix=${i#/etc/rc$runlevel.d/S[0-9][0-9]} + stop=/etc/rc$runlevel.d/K[0-9][0-9]$suffix + previous_start=/etc/rc$previous.d/S[0-9][0-9]$suffix + # + # If there is a start script in the previous level + # and _no_ stop script in this level, we don't + # have to re-start the service. + # + [ -f $previous_start ] && [ ! -f $stop ] && continue + fi + case "$runlevel" in + 0|6) + startup $i stop + ;; + *) + startup $i start + ;; + esac + done + fi + +#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 + TMPDIR=/mnt/.psplash psplash-write "QUIT" || true + umount -l /mnt/.psplash + fi +fi diff --git a/meta-oe/recipes-core/sysvinit/sysvinit_2.88dsf.bbappend b/meta-oe/recipes-core/sysvinit/sysvinit_2.88dsf.bbappend index b9a51a02f87..44893981db1 100644 --- a/meta-oe/recipes-core/sysvinit/sysvinit_2.88dsf.bbappend +++ b/meta-oe/recipes-core/sysvinit/sysvinit_2.88dsf.bbappend @@ -7,10 +7,7 @@ PACKAGE_ARCH := "${MACHINE_ARCH}" SRC_URI += " \ file://67_init_hddown.dpatch \ file://92_sata-hddown.dpatch \ - ${@base_contains("MACHINE_FEATURES", "gbprogress", "file://proc_progressgb.patch", "file://proc_progress.patch", d)} \ - ${@base_contains("MACHINE_FEATURES", "gbplusprogress", "file://proc_progressgbplus.patch", "", d)} \ - ${@base_contains("MACHINE_FEATURES", "vuprogress", "file://proc_progress_vuplus.patch", "", d)} \ - ${@base_contains("MACHINE", "inihdp", "file://proc_progress_ini.patch", "", d)}" +" do_install_append() { rm ${D}${sysconfdir}/rc*.d/*bootlogd