Merge bk://oe-devel@oe-devel.bkbits.net/openembedded

into tim.rpsys.net:/usr/oe/openembedded

2005/01/31 12:59:40+00:00 rpsys.net!RP
initscripts: updates to support keymaps under openzaurus-pxa-2.6

BKrev: 41fe2bcc7HKWpCT04N-VKln2ZgR6wA

diff --git a/packages/initscripts/initscripts-1.0/openzaurus-pxa-2.6/corgikeymap.map b/packages/initscripts/initscripts-1.0/openzaurus-pxa-2.6/corgikeymap.map
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/initscripts/initscripts-1.0/openzaurus-pxa-2.6/keymap.sh b/packages/initscripts/initscripts-1.0/openzaurus-pxa-2.6/keymap.sh
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 4a423fe..3e29efd 100644 (file)
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -5,8 +5,9 @@ PRIORITY = "required"
 DEPENDS = "makedevs"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
+RDEPENDS_openzaurus-pxa-2.6 = "makedevs console-tools"
 LICENSE = "GPL"
-PR = "r29"
+PR = "r30"
 
 SRC_URI = "file://halt \
            file://ramdisk \
@@ -33,6 +34,8 @@ SRC_URI = "file://halt \
 
 SRC_URI_append_arm = " file://alignment.sh"
 SRC_URI_append_openzaurus = " file://checkversion"
+SRC_URI_append_openzaurus-pxa-2.6 = " file://corgikeymap.map"
+SRC_URI_append_openzaurus-pxa-2.6 = " file://keymap.sh"
 
 def read_kernel_version(d):
        import bb
@@ -89,6 +92,13 @@ do_install () {
                ln -sf          ../init.d/checkversion  ${D}/etc/rcS.d/S05version
        fi
 
+       if [ "${MACHINE}" == "openzaurus-pxa-2.6" ]; then
+               install -m 0755    ${WORKDIR}/corgikeymap.map           ${D}/etc
+               install -m 0755    ${WORKDIR}/keymap.sh                 ${D}/etc/init.d
+               ln -sf          ../init.d/keymap.sh     ${D}/etc/rcS.d/S04keymap.sh
+       fi
+
+
        install -m 0755 ${WORKDIR}/banner       ${D}/etc/init.d/banner
        install -m 0755 ${WORKDIR}/devices      ${D}/etc/init.d/devices
        install -m 0755 ${WORKDIR}/umountfs     ${D}/etc/init.d/umountfs