Merge packages changes from OE into poky.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@386 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 2 insertions, 19 deletions

diff --git a/openembedded/packages/initscripts/initscripts_1.0.bb b/openembedded/packages/initscripts/initscripts_1.0.bb
index 7b50d23f73..eebfbca7bf 100644
--- a/openembedded/packages/initscripts/initscripts_1.0.bb
+++ b/openembedded/packages/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r69"
+PR = "r73"
 
 SRC_URI = "file://halt \
            file://ramdisk \
@@ -31,17 +31,10 @@ SRC_URI = "file://halt \
            file://sysfs.sh \
            file://device_table.txt \
            file://populate-volatile.sh \
-           file://volatiles \
-           file://keymap"
+           file://volatiles "
 
 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_collie       = " file://keymap-*.map"
-SRC_URI_append_poodle       = " file://keymap-*.map"
 
 def read_kernel_version(d):
         import bb
@@ -103,16 +96,6 @@ do_install () {
                 ln -sf          ../init.d/checkversion  ${D}${sysconfdir}/rcS.d/S01version
         fi
 
-    case ${MACHINE} in
-        c7x0 | tosa | spitz | akita | collie | poodle )
-                        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
-
         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