Update hdparm, initscripts (keymap), module-init-tools

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

11 files changed, 82 insertions, 5 deletions

diff --git a/openembedded/packages/hdparm/hdparm-6.1/bswap.patch b/openembedded/packages/hdparm/hdparm-6.3/bswap.patch
index 37fbcb7b38..37fbcb7b38 100644
--- a/openembedded/packages/hdparm/hdparm-6.1/bswap.patch
+++ b/openembedded/packages/hdparm/hdparm-6.3/bswap.patch
diff --git a/openembedded/packages/hdparm/hdparm-6.1/uclibc.patch b/openembedded/packages/hdparm/hdparm-6.3/uclibc.patch
index 495d7491bb..495d7491bb 100644
--- a/openembedded/packages/hdparm/hdparm-6.1/uclibc.patch
+++ b/openembedded/packages/hdparm/hdparm-6.3/uclibc.patch
diff --git a/openembedded/packages/hdparm/hdparm_6.3.bb b/openembedded/packages/hdparm/hdparm_6.3.bb
new file mode 100644
index 0000000000..a917289513
--- /dev/null
+++ b/openembedded/packages/hdparm/hdparm_6.3.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "hdparm is a Linux shell utility for viewing \
+and manipulating various IDE drive and driver parameters."
+SECTION = "console/utils"
+PRIORITY = "optional"
+LICENSE = "BSD"
+
+SRC_URI = "http://www.ibiblio.org/pub/Linux/system/hardware/hdparm-${PV}.tar.gz \
+	   file://bswap.patch;patch=1 \
+	   file://uclibc.patch;patch=1"
+
+do_install () {
+	install -d ${D}/${sbindir} ${D}/${mandir}/man8
+	oe_runmake 'DESTDIR=${D}' install
+}
diff --git a/openembedded/packages/initscripts/initscripts-1.0/akita/keymap-2.6.map b/openembedded/packages/initscripts/initscripts-1.0/akita/keymap-2.6.map
index dc7fa37401..6fc3a9a9cf 100644
--- a/openembedded/packages/initscripts/initscripts-1.0/akita/keymap-2.6.map
+++ b/openembedded/packages/initscripts/initscripts-1.0/akita/keymap-2.6.map
@@ -30,7 +30,7 @@ keycode  13 =
 keycode  14 = BackSpace
 	altgr keycode 14 = Delete
 keycode  15 = Tab
-	shift keycode 65 = Caps_Lock
+	altgr keycode 15 = Caps_Lock
 keycode  16 = q               
 keycode  17 = w               
 	altgr keycode 17 = asciicircum
diff --git a/openembedded/packages/initscripts/initscripts-1.0/borzoi/keymap-2.6.map b/openembedded/packages/initscripts/initscripts-1.0/borzoi/keymap-2.6.map
index dc7fa37401..6fc3a9a9cf 100644
--- a/openembedded/packages/initscripts/initscripts-1.0/borzoi/keymap-2.6.map
+++ b/openembedded/packages/initscripts/initscripts-1.0/borzoi/keymap-2.6.map
@@ -30,7 +30,7 @@ keycode  13 =
 keycode  14 = BackSpace
 	altgr keycode 14 = Delete
 keycode  15 = Tab
-	shift keycode 65 = Caps_Lock
+	altgr keycode 15 = Caps_Lock
 keycode  16 = q               
 keycode  17 = w               
 	altgr keycode 17 = asciicircum
diff --git a/openembedded/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map b/openembedded/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map
index dc7fa37401..6fc3a9a9cf 100755
--- a/openembedded/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map
+++ b/openembedded/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map
@@ -30,7 +30,7 @@ keycode  13 =
 keycode  14 = BackSpace
 	altgr keycode 14 = Delete
 keycode  15 = Tab
-	shift keycode 65 = Caps_Lock
+	altgr keycode 15 = Caps_Lock
 keycode  16 = q               
 keycode  17 = w               
 	altgr keycode 17 = asciicircum
diff --git a/openembedded/packages/initscripts/initscripts-1.0/spitz/keymap-2.6.map b/openembedded/packages/initscripts/initscripts-1.0/spitz/keymap-2.6.map
index dc7fa37401..6fc3a9a9cf 100644
--- a/openembedded/packages/initscripts/initscripts-1.0/spitz/keymap-2.6.map
+++ b/openembedded/packages/initscripts/initscripts-1.0/spitz/keymap-2.6.map
@@ -30,7 +30,7 @@ keycode  13 =
 keycode  14 = BackSpace
 	altgr keycode 14 = Delete
 keycode  15 = Tab
-	shift keycode 65 = Caps_Lock
+	altgr keycode 15 = Caps_Lock
 keycode  16 = q               
 keycode  17 = w               
 	altgr keycode 17 = asciicircum
diff --git a/openembedded/packages/initscripts/initscripts_1.0.bb b/openembedded/packages/initscripts/initscripts_1.0.bb
index 2ad0197a75..c5332f23cf 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 = "r58"
+PR = "r59"
 
 SRC_URI = "file://halt \
            file://ramdisk \
diff --git a/openembedded/packages/module-init-tools/module-init-tools-3.2-pre9/ignore_arch_directory b/openembedded/packages/module-init-tools/module-init-tools-3.2.1/ignore_arch_directory
index 185ea7a3a5..185ea7a3a5 100644
--- a/openembedded/packages/module-init-tools/module-init-tools-3.2-pre9/ignore_arch_directory
+++ b/openembedded/packages/module-init-tools/module-init-tools-3.2.1/ignore_arch_directory
diff --git a/openembedded/packages/module-init-tools/module-init-tools-3.2-pre9/manpagesopt b/openembedded/packages/module-init-tools/module-init-tools-3.2.1/manpagesopt
index 5d5cac609e..5d5cac609e 100644
--- a/openembedded/packages/module-init-tools/module-init-tools-3.2-pre9/manpagesopt
+++ b/openembedded/packages/module-init-tools/module-init-tools-3.2.1/manpagesopt
diff --git a/openembedded/packages/module-init-tools/module-init-tools_3.2.1.bb b/openembedded/packages/module-init-tools/module-init-tools_3.2.1.bb
new file mode 100644
index 0000000000..bbd8cca1bf
--- /dev/null
+++ b/openembedded/packages/module-init-tools/module-init-tools_3.2.1.bb
@@ -0,0 +1,63 @@
+DESCRIPTION = "This package contains a set of programs for loading, inserting, and \
+removing kernel modules for Linux (versions 2.5.48 and above). It serves \
+the same function that the modutils package serves for Linux 2.4."
+LICENSE = "GPL"
+SECTION = "base"
+PR = "r0"
+
+PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
+RDEPENDS_${PN} += "module-init-tools-depmod"
+
+FILES_module-init-tools-depmod = "${sbindir}/depmod.26"
+FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static"
+
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \
+	   file://ignore_arch_directory;patch=1 \
+	   file://modutils_extension;patch=1 \
+	   file://no_man_rebuild;patch=1 \
+	   file://manpagesopt;patch=1 "
+S = "${WORKDIR}/module-init-tools-${PV}"
+
+EXTRA_OECONF = "--disable-manpages"
+
+bindir = "/bin"
+sbindir = "/sbin"
+
+inherit autotools
+
+do_install() {
+	autotools_do_install
+	for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do
+		mv ${D}/$f ${D}/$f.26
+	done
+}
+
+pkg_postinst_module-init-tools() {
+#!/bin/sh
+for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo; do
+bn=`basename $f`
+   update-alternatives --install /$f $bn /$f.26 60
+done
+update-alternatives --install /bin/lsmod bin-lsmod /bin/lsmod.26 60
+update-alternatives --install /sbin/lsmod lsmod /bin/lsmod.26 60
+}
+
+pkg_prerm_module-init-tools() {
+#!/bin/sh
+for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo; do
+bn=`basename $f`
+   update-alternatives --remove $bn /$f.26
+done
+update-alternatives --remove bin-lsmod /bin/lsmod.26
+update-alternatives --remove lsmod /bin/lsmod.26
+}
+
+pkg_postinst_module-init-tools-depmod() {
+#!/bin/sh
+update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 60
+}
+
+pkg_prerm_module-init-tools() {
+#!/bin/sh
+update-alternatives --remove depmod /sbin/depmod.26
+}