diff options
| author | Rod Whitby <rod@whitby.id.au> | 2005-07-20 21:08:16 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-20 21:08:16 +0000 |
| commit | 8aba67c458151eb8e611c7548029774be457a3cc (patch) | |
| tree | 917cb361e1bbf88cca3779083ca40c58d25afaa8 /packages/initscripts | |
| parent | e79d569187ca920ba7b86daf5a1fc5c4e7c45d82 (diff) | |
| parent | 33915eef51db1dd1f6e43bb61c92eb30c68b51b7 (diff) | |
merge of 145ec84e58e7acefd29711cc2431b9809b8804e9
and 35b8f55d1b410a1bfaf9a685272c65e43f330691
Diffstat (limited to 'packages/initscripts')
| -rw-r--r-- | packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map | 2 | ||||
| -rw-r--r-- | packages/initscripts/initscripts_1.0.bb | 29 |
2 files changed, 11 insertions, 20 deletions
diff --git a/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map b/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map index 5b576ecc93..dc7fa37401 100644 --- a/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map +++ b/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map @@ -108,11 +108,13 @@ keycode 88 = F11 keycode 97 = Control keycode 99 = F12 keycode 103 = Up + altgr keycode 103 = PageUp keycode 105 = Left altgr keycode 105 = Decr_Console keycode 106 = Right altgr keycode 106 = Incr_Console keycode 108 = Down + altgr keycode 108 = PageDown string F1 = "\033[[A" string F2 = "\033[[B" string F3 = "\033[[C" diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 3fbbda4cf8..32cfc6c7a6 100644 --- 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 = "r48" +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} } |