summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Hentges <oe@hentges.net>2005-07-22 15:16:02 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-07-22 15:16:02 +0000
commit8070737c6ef3adcfc3825efff1797317140af251 (patch)
treed538e4a5b08ceae600074a5ce283045a746e7f00
parenteef260859916b998e0ff64c12a186ff386ca6051 (diff)
parent1c0040178580c0c9b3926f1c92e5cb6c21ee7893 (diff)
merge of 113e53533fd379355156720bc34edd95b0322f33
and 750e11a1ae1b2f764d9f8957da4d35526d71d7a4
-rw-r--r--packages/initscripts/initscripts_1.0.bb45
1 files changed, 23 insertions, 22 deletions
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index f61f1e8128..3fbbda4cf8 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 = "r50"
+PR = "r48"
SRC_URI = "file://halt \
file://ramdisk \
@@ -30,16 +30,15 @@ SRC_URI = "file://halt \
file://umountnfs.sh \
file://sysfs.sh \
file://device_table.txt \
- file://populate-volatile.sh \
- file://volatiles \
- file://keymap"
+ file://populate-volatile.sh \
+ file://volatiles \
+ file://corgikeymap-2.6.map \
+ file://tosakeymap-2.6.map"
-SRC_URI_append_arm = " file://alignment.sh"
-SRC_URI_append_openzaurus = " file://checkversion"
-SRC_URI_append_c7x0 = " file://keymap-*.map"
-SRC_URI_append_tosa = " file://keymap-*.map"
-SRC_URI_append_akita = " file://keymap-*.map"
-SRC_URI_append_spitz = " 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
@@ -96,19 +95,21 @@ do_install () {
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
+ chmod 0755 ${D}${sysconfdir}/init.d/checkversion
+ ln -sf ../init.d/checkversion ${D}${sysconfdir}/rcS.d/S01version
fi
- case ${MACHINE} in
- c7x0 | tosa | spitz | akita )
- install -m 0755 ${WORKDIR}/keymap ${D}${sysconfdir}/init.d
- ln -sf ../init.d/keymap ${D}${sysconfdir}/rcS.d/S00keymap
- install -m 0644 ${WORKDIR}/keymap-*.map ${D}${sysconfdir}
- ;;
- *)
- ;;
- esac
+ 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
@@ -149,5 +150,5 @@ 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
}