recreate initscripts patch that has been lost during our db chaos

hopefully the last time...

diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index cdb418e..32cfc6c 100644 (file)
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r49"
+PR = "r50"
 
 SRC_URI = "file://halt \
            file://ramdisk \
@@ -30,15 +30,13 @@ SRC_URI = "file://halt \
            file://umountnfs.sh \
            file://sysfs.sh \
            file://device_table.txt \
-          file://populate-volatile.sh \
-          file://volatiles \
-           file://corgikeymap-2.6.map \
-           file://tosakeymap-2.6.map"
+           file://populate-volatile.sh \
+           file://volatiles \
+           file://keymap \
+           file://keymap*.map"
 
 SRC_URI_append_arm = " file://alignment.sh"
 SRC_URI_append_openzaurus = " file://checkversion"
-SRC_URI_append_c7x0 =    " file://keymap"
-SRC_URI_append_tosa =    " file://keymap"
 
 def read_kernel_version(d):
        import bb
@@ -99,21 +97,10 @@ do_install () {
                ln -sf          ../init.d/checkversion  ${D}${sysconfdir}/rcS.d/S01version
        fi
 
-       if [ "${MACHINE}" == "c7x0" ]; then
-               install -m 0755    ${WORKDIR}/corgikeymap-2.6.map               ${D}${sysconfdir}
-               install -m 0755    ${WORKDIR}/keymap                            ${D}${sysconfdir}/init.d
-               ln -sf          ../init.d/keymap                                ${D}${sysconfdir}/rcS.d/S00keymap
-       fi
-
-       if [ "${MACHINE}" == "tosa" ]; then
-               install -m 0755    ${WORKDIR}/tosakeymap-2.6.map                ${D}${sysconfdir}
-               install -m 0755    ${WORKDIR}/keymap                            ${D}${sysconfdir}/init.d
-               ln -sf          ../init.d/keymap                                ${D}${sysconfdir}/rcS.d/S00keymap
-       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
+       install -m 0755 ${WORKDIR}/keymap       ${D}${sysconfdir}/init.d/keymap
 #
 # Create runlevel links
 #
@@ -132,6 +119,7 @@ do_install () {
        ln -sf          ../init.d/umountnfs.sh  ${D}${sysconfdir}/rc0.d/S31umountnfs.sh
 #      ln -sf          ../init.d/umountfs      ${D}${sysconfdir}/rc0.d/S40umountfs
        ln -sf          ../init.d/halt          ${D}${sysconfdir}/rc0.d/S90halt
+       ln -sf          ../init.d/keymap        ${D}${sysconfdir}/rcS.d/S00keymap
        ln -sf          ../init.d/banner        ${D}${sysconfdir}/rcS.d/S02banner
        ln -sf          ../init.d/checkroot.sh  ${D}${sysconfdir}/rcS.d/S10checkroot.sh
 #      ln -sf          ../init.d/checkfs.sh    ${D}${sysconfdir}/rcS.d/S30checkfs.sh
@@ -150,5 +138,6 @@ do_install () {
                ln -sf  ../init.d/alignment.sh  ${D}${sysconfdir}/rcS.d/S06alignment
        fi
 
-       install -m 0755    ${WORKDIR}/device_table.txt          ${D}${sysconfdir}/device_table
+       install -m 0755         ${WORKDIR}/device_table.txt             ${D}${sysconfdir}/device_table
+       install -m 0644         ${WORKDIR}/keymap*.map                  ${D}${sysconfdir}
 }