initscripts: dropped OpenZaurus specific checkversion script

diff --git a/packages/initscripts/initscripts-1.0/openzaurus/.mtn2git_empty b/packages/initscripts/initscripts-1.0/openzaurus/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/initscripts/initscripts-1.0/openzaurus/checkversion b/packages/initscripts/initscripts-1.0/openzaurus/checkversion
deleted file mode 100755 (executable)
index 0c8be4f..0000000
--- a/packages/initscripts/initscripts-1.0/openzaurus/checkversion
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-found=`cat /proc/version | cut -d ' ' -f3`
-echo "$found" | grep -q "snapshot" && exit 0
-
-if [ "VERSION" != "$found" ] ; then
-       echo -e >/dev/tty1
-       echo -e "\033[31;1m ******************************************* \033[0m" >/dev/tty1
-       echo -e "\033[31;1m *            \033[0mW A R N I N G !              \033[31;1m* \033[0m" >/dev/tty1
-       echo -e "\033[31;1m ******************************************* \033[0m" >/dev/tty1
-       echo >/dev/tty1
-       echo -e "\033[31;1m ******************************************* \033[0m" >/dev/tty1
-        echo -e "\033[31;1m *    \033[0mYou are running the wrong kernel!    \033[31;1m* \033[0m" >/dev/tty1
-        echo -e "\033[31;1m ******************************************* \033[0m" >/dev/tty1
-       echo >/dev/tty1
-       echo -e "You are running '" $found "'"                                   >/dev/tty1
-       echo -e "I expect kernel '" VERSION "'"                                  >/dev/tty1
-       echo >/dev/tty1
-        echo -e "\033[31;1m ******************************************* \033[0m" >/dev/tty1
-        echo -e "\033[31;1m * \033[0mRunning this combination is unsupported \033[31;1m* \033[0m" >/dev/tty1
-        echo -e "\033[31;1m ******************************************* \033[0m" >/dev/tty1
-       echo >/dev/tty1
-       echo "I will sleep for 1 minute now. Use this chance to "                >/dev/tty1
-       echo "reboot the device and flash the proper kernel now! "               >/dev/tty1
-        echo -e >/dev/tty1
-        echo -e "\033[31;1m ******************************************* \033[0m" >/dev/tty1
-        echo -e "\033[31;1m *            \033[0mW A R N I N G !              \033[31;1m* \033[0m" >/dev/tty1
-        echo -e "\033[31;1m ******************************************* \033[0m" >/dev/tty1
-        echo >/dev/tty1
-       sleep 60
-fi

diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 83c753d..4409c30 100644 (file)
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -2,10 +2,9 @@ DESCRIPTION = "SysV init scripts"
 SECTION = "base"
 PRIORITY = "required"
 DEPENDS = "makedevs"
-DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r88"
+PR = "r89"
 
 SRC_URI = "file://halt \
            file://ramdisk \
@@ -34,19 +33,8 @@ SRC_URI = "file://halt \
           file://save-rtc.sh"
 
 SRC_URI_append_arm          = " file://alignment.sh"
-SRC_URI_append_openzaurus   = " file://checkversion"
 
-def read_kernel_version(d):
-       import bb
-       distro = bb.data.getVar('DISTRO', d, 1)
-       filename = bb.data.getVar('STAGING_KERNEL_DIR', d, 1)
-       if distro == "openzaurus":
-               return file( filename + "/kernel-abiversion", "r" ).read().strip()
-       else:
-               return "not important"
 KERNEL_VERSION = ""
-KERNEL_VERSION_openzaurus = "${@read_kernel_version(d)}"
-PACKAGE_ARCH_openzaurus = "${MACHINE_ARCH}"
 
 do_install () {
 #
@@ -90,13 +78,6 @@ do_install () {
 #
 # Install device dependent scripts
 #
-
-       if [ "${DISTRO}" = "openzaurus" ]; then
-               cat ${WORKDIR}/checkversion | sed -e "s,VERSION,${KERNEL_VERSION}-${DISTRO_VERSION}," > ${D}${sysconfdir}/init.d/checkversion
-               chmod 0755      ${D}${sysconfdir}/init.d/checkversion
-               ln -sf          ../init.d/checkversion  ${D}${sysconfdir}/rcS.d/S01version
-       fi
-
        install -m 0755 ${WORKDIR}/banner       ${D}${sysconfdir}/init.d/banner
        install -m 0755 ${WORKDIR}/devices      ${D}${sysconfdir}/init.d/devices
        install -m 0755 ${WORKDIR}/umountfs     ${D}${sysconfdir}/init.d/umountfs