From 42406332d13e724e2abb052add98ac0e7316c7ac Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 13 Dec 2005 09:15:15 +0000 Subject: Update hdparm, initscripts (keymap), module-init-tools git-svn-id: https://svn.o-hand.com/repos/poky@192 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../packages/hdparm/hdparm-6.1/bswap.patch | 36 ------------- .../packages/hdparm/hdparm-6.1/uclibc.patch | 32 ----------- .../packages/hdparm/hdparm-6.3/bswap.patch | 36 +++++++++++++ .../packages/hdparm/hdparm-6.3/uclibc.patch | 32 +++++++++++ openembedded/packages/hdparm/hdparm_6.3.bb | 14 +++++ .../initscripts-1.0/akita/keymap-2.6.map | 2 +- .../initscripts-1.0/borzoi/keymap-2.6.map | 2 +- .../initscripts-1.0/c7x0/keymap-2.6.map | 2 +- .../initscripts-1.0/spitz/keymap-2.6.map | 2 +- .../packages/initscripts/initscripts_1.0.bb | 2 +- .../ignore_arch_directory | 24 --------- .../module-init-tools-3.2-pre9/manpagesopt | 41 -------------- .../module-init-tools-3.2.1/ignore_arch_directory | 24 +++++++++ .../module-init-tools-3.2.1/manpagesopt | 41 ++++++++++++++ .../module-init-tools/module-init-tools_3.2.1.bb | 63 ++++++++++++++++++++++ 15 files changed, 215 insertions(+), 138 deletions(-) delete mode 100644 openembedded/packages/hdparm/hdparm-6.1/bswap.patch delete mode 100644 openembedded/packages/hdparm/hdparm-6.1/uclibc.patch create mode 100644 openembedded/packages/hdparm/hdparm-6.3/bswap.patch create mode 100644 openembedded/packages/hdparm/hdparm-6.3/uclibc.patch create mode 100644 openembedded/packages/hdparm/hdparm_6.3.bb delete mode 100644 openembedded/packages/module-init-tools/module-init-tools-3.2-pre9/ignore_arch_directory delete mode 100644 openembedded/packages/module-init-tools/module-init-tools-3.2-pre9/manpagesopt create mode 100644 openembedded/packages/module-init-tools/module-init-tools-3.2.1/ignore_arch_directory create mode 100644 openembedded/packages/module-init-tools/module-init-tools-3.2.1/manpagesopt create mode 100644 openembedded/packages/module-init-tools/module-init-tools_3.2.1.bb (limited to 'openembedded') diff --git a/openembedded/packages/hdparm/hdparm-6.1/bswap.patch b/openembedded/packages/hdparm/hdparm-6.1/bswap.patch deleted file mode 100644 index 37fbcb7b3..000000000 --- a/openembedded/packages/hdparm/hdparm-6.1/bswap.patch +++ /dev/null @@ -1,36 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- hdparm-5.8/hdparm.c~bswap -+++ hdparm-5.8/hdparm.c -@@ -20,7 +20,9 @@ - #include - #include - #include --#include -+#include -+ -+#define le16_to_cpus(x) bswap_16(htons(x)) - - #include "hdparm.h" - -@@ -1160,7 +1162,7 @@ - } - } else { - for(i = 0; i < 0x100; ++i) { -- __le16_to_cpus(&id[i]); -+ le16_to_cpus(&id[i]); - } - identify((void *)id, NULL); - } -@@ -1380,7 +1382,7 @@ - } - for (i = 0; count >= 4; ++i) { - sbuf[i] = (fromhex(b[0]) << 12) | (fromhex(b[1]) << 8) | (fromhex(b[2]) << 4) | fromhex(b[3]); -- __le16_to_cpus((__u16 *)(&sbuf[i])); -+ le16_to_cpus((__u16 *)(&sbuf[i])); - b += 5; - count -= 5; - } diff --git a/openembedded/packages/hdparm/hdparm-6.1/uclibc.patch b/openembedded/packages/hdparm/hdparm-6.1/uclibc.patch deleted file mode 100644 index 495d7491b..000000000 --- a/openembedded/packages/hdparm/hdparm-6.1/uclibc.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- hdparm-5.8/hdparm.c.ark 2005-05-22 19:48:34.000000000 +0000 -+++ hdparm-5.8/hdparm.c 2005-05-22 19:52:18.000000000 +0000 -@@ -17,7 +17,9 @@ - #include - #include - #include -+#ifndef __UCLIBC__ - #include -+#endif - #include - #include - #include ---- hdparm-5.8/hdparm.h.ark 2005-05-22 19:51:49.000000000 +0000 -+++ hdparm-5.8/hdparm.h 2005-05-22 19:54:54.000000000 +0000 -@@ -1,6 +1,6 @@ - /* Some prototypes for extern functions. */ - --#include /* for __u16 */ -+#include - - #if !defined(__GNUC__) && !defined(__attribute__) - #define __attribute__(x) /* if not using GCC, turn off the __attribute__ -@@ -11,7 +11,7 @@ - others, though, were declared in hdparm.c with global scope; since other - functions in that file have static (file) scope, I assume the difference is - intentional. */ --extern void identify (__u16 *id_supplied, const char *devname); -+extern void identify (uint16_t *id_supplied, const char *devname); - - extern void usage_error(int out) __attribute__((noreturn)); - extern int main(int argc, char **argv) __attribute__((noreturn)); - diff --git a/openembedded/packages/hdparm/hdparm-6.3/bswap.patch b/openembedded/packages/hdparm/hdparm-6.3/bswap.patch new file mode 100644 index 000000000..37fbcb7b3 --- /dev/null +++ b/openembedded/packages/hdparm/hdparm-6.3/bswap.patch @@ -0,0 +1,36 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- hdparm-5.8/hdparm.c~bswap ++++ hdparm-5.8/hdparm.c +@@ -20,7 +20,9 @@ + #include + #include + #include +-#include ++#include ++ ++#define le16_to_cpus(x) bswap_16(htons(x)) + + #include "hdparm.h" + +@@ -1160,7 +1162,7 @@ + } + } else { + for(i = 0; i < 0x100; ++i) { +- __le16_to_cpus(&id[i]); ++ le16_to_cpus(&id[i]); + } + identify((void *)id, NULL); + } +@@ -1380,7 +1382,7 @@ + } + for (i = 0; count >= 4; ++i) { + sbuf[i] = (fromhex(b[0]) << 12) | (fromhex(b[1]) << 8) | (fromhex(b[2]) << 4) | fromhex(b[3]); +- __le16_to_cpus((__u16 *)(&sbuf[i])); ++ le16_to_cpus((__u16 *)(&sbuf[i])); + b += 5; + count -= 5; + } diff --git a/openembedded/packages/hdparm/hdparm-6.3/uclibc.patch b/openembedded/packages/hdparm/hdparm-6.3/uclibc.patch new file mode 100644 index 000000000..495d7491b --- /dev/null +++ b/openembedded/packages/hdparm/hdparm-6.3/uclibc.patch @@ -0,0 +1,32 @@ +--- hdparm-5.8/hdparm.c.ark 2005-05-22 19:48:34.000000000 +0000 ++++ hdparm-5.8/hdparm.c 2005-05-22 19:52:18.000000000 +0000 +@@ -17,7 +17,9 @@ + #include + #include + #include ++#ifndef __UCLIBC__ + #include ++#endif + #include + #include + #include +--- hdparm-5.8/hdparm.h.ark 2005-05-22 19:51:49.000000000 +0000 ++++ hdparm-5.8/hdparm.h 2005-05-22 19:54:54.000000000 +0000 +@@ -1,6 +1,6 @@ + /* Some prototypes for extern functions. */ + +-#include /* for __u16 */ ++#include + + #if !defined(__GNUC__) && !defined(__attribute__) + #define __attribute__(x) /* if not using GCC, turn off the __attribute__ +@@ -11,7 +11,7 @@ + others, though, were declared in hdparm.c with global scope; since other + functions in that file have static (file) scope, I assume the difference is + intentional. */ +-extern void identify (__u16 *id_supplied, const char *devname); ++extern void identify (uint16_t *id_supplied, const char *devname); + + extern void usage_error(int out) __attribute__((noreturn)); + extern int main(int argc, char **argv) __attribute__((noreturn)); + diff --git a/openembedded/packages/hdparm/hdparm_6.3.bb b/openembedded/packages/hdparm/hdparm_6.3.bb new file mode 100644 index 000000000..a91728951 --- /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 dc7fa3740..6fc3a9a9c 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 dc7fa3740..6fc3a9a9c 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 dc7fa3740..6fc3a9a9c 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 dc7fa3740..6fc3a9a9c 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 2ad0197a7..c5332f23c 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-pre9/ignore_arch_directory deleted file mode 100644 index 185ea7a3a..000000000 --- a/openembedded/packages/module-init-tools/module-init-tools-3.2-pre9/ignore_arch_directory +++ /dev/null @@ -1,24 +0,0 @@ -diff -ruN module-init-tools-3.1-pre6.orig/modprobe.8 module-init-tools-3.1-pre6/modprobe.8 ---- module-init-tools-3.2-pre7/modprobe.8.orig 2005-07-05 13:52:32.000000000 +0200 -+++ module-init-tools-3.2-pre7/modprobe.8 2005-07-05 13:52:42.000000000 +0200 -@@ -31,6 +31,7 @@ - \fI/etc/modprobe.conf\fR configuration file and - \fI/etc/modprobe.d\fR directory - (see \fBmodprobe.conf\fR(5)). -+All files in the \fI/etc/modprobe.d/arch/\fR directory are ignored. - .PP - Note that this version of \fBmodprobe\fR does not - do anything to the module itself: the work of resolving symbols ---- module-init-tools-3.2-pre7/modprobe.c.orig 2005-07-05 13:50:00.000000000 +0200 -+++ module-init-tools-3.2-pre7/modprobe.c 2005-07-05 13:50:15.000000000 +0200 -@@ -1158,6 +1158,10 @@ - DIR *dir; - int ret = 0; - -+ /* ignore everything in this directory */ -+ if (streq(filename, "/etc/modprobe.d/arch")) -+ return 1; -+ - /* Reiser4 has file/directory duality: treat it as both. */ - dir = opendir(filename); - if (dir) { 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-pre9/manpagesopt deleted file mode 100644 index 5d5cac609..000000000 --- a/openembedded/packages/module-init-tools/module-init-tools-3.2-pre9/manpagesopt +++ /dev/null @@ -1,41 +0,0 @@ -Index: module-init-tools-3.2-pre9/configure.in -=================================================================== ---- module-init-tools-3.2-pre9.orig/configure.in 2005-08-09 04:31:26.000000000 +0000 -+++ module-init-tools-3.2-pre9/configure.in 2005-09-20 22:06:10.000000000 +0000 -@@ -41,5 +41,14 @@ - fi]) - AC_SUBST(MODULE_DIR) - --AC_OUTPUT([Makefile]) -+AC_ARG_ENABLE(manpages, -+[ --disable-manpages Disable man page generation.], -+[if test x"$enableval" != x"no"; then -+ enable_manpages=yes -+else -+ enable_manpages=no -+fi], -+[enable_manpages=yes]) -+AM_CONDITIONAL([MANPAGES], test x"$enable_manpages" = x"yes") - -+AC_OUTPUT([Makefile]) -Index: module-init-tools-3.2-pre9/Makefile.am -=================================================================== ---- module-init-tools-3.2-pre9.orig/Makefile.am 2005-08-09 04:54:28.000000000 +0000 -+++ module-init-tools-3.2-pre9/Makefile.am 2005-09-20 22:09:03.000000000 +0000 -@@ -21,13 +21,14 @@ - MAN5 = modprobe.conf.5 modules.dep.5 - MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8 - SGML = $(addprefix doc/, $(MAN5:%.5=%.sgml) $(MAN8:%.8=%.sgml)) --man_MANS = $(MAN5) $(MAN8) - # If they haven't overridden mandir, fix it (never /man!) - mandir =$(shell if [ @mandir@ = $(prefix)/man ]; then if [ $(prefix) = / ]; then echo /usr/share/man; else echo $(prefix)/share/man; fi; else echo @mandir@; fi) - - TESTSUITE := $(shell find tests -type f ! -name '*~') tests/vg-suppressions - --EXTRA_DIST = generate-modprobe.conf modprobe.devfs FAQ CODING stress_modules.sh install-with-care $(SGML) $(man_MANS) $(TESTSUITE) -+if MANPAGES -+man_MANS = $(MAN5) $(MAN8) -+endif - - sbin_PROGRAMS = insmod modprobe rmmod depmod modinfo insmod.static - bin_PROGRAMS = lsmod diff --git a/openembedded/packages/module-init-tools/module-init-tools-3.2.1/ignore_arch_directory b/openembedded/packages/module-init-tools/module-init-tools-3.2.1/ignore_arch_directory new file mode 100644 index 000000000..185ea7a3a --- /dev/null +++ b/openembedded/packages/module-init-tools/module-init-tools-3.2.1/ignore_arch_directory @@ -0,0 +1,24 @@ +diff -ruN module-init-tools-3.1-pre6.orig/modprobe.8 module-init-tools-3.1-pre6/modprobe.8 +--- module-init-tools-3.2-pre7/modprobe.8.orig 2005-07-05 13:52:32.000000000 +0200 ++++ module-init-tools-3.2-pre7/modprobe.8 2005-07-05 13:52:42.000000000 +0200 +@@ -31,6 +31,7 @@ + \fI/etc/modprobe.conf\fR configuration file and + \fI/etc/modprobe.d\fR directory + (see \fBmodprobe.conf\fR(5)). ++All files in the \fI/etc/modprobe.d/arch/\fR directory are ignored. + .PP + Note that this version of \fBmodprobe\fR does not + do anything to the module itself: the work of resolving symbols +--- module-init-tools-3.2-pre7/modprobe.c.orig 2005-07-05 13:50:00.000000000 +0200 ++++ module-init-tools-3.2-pre7/modprobe.c 2005-07-05 13:50:15.000000000 +0200 +@@ -1158,6 +1158,10 @@ + DIR *dir; + int ret = 0; + ++ /* ignore everything in this directory */ ++ if (streq(filename, "/etc/modprobe.d/arch")) ++ return 1; ++ + /* Reiser4 has file/directory duality: treat it as both. */ + dir = opendir(filename); + if (dir) { diff --git a/openembedded/packages/module-init-tools/module-init-tools-3.2.1/manpagesopt b/openembedded/packages/module-init-tools/module-init-tools-3.2.1/manpagesopt new file mode 100644 index 000000000..5d5cac609 --- /dev/null +++ b/openembedded/packages/module-init-tools/module-init-tools-3.2.1/manpagesopt @@ -0,0 +1,41 @@ +Index: module-init-tools-3.2-pre9/configure.in +=================================================================== +--- module-init-tools-3.2-pre9.orig/configure.in 2005-08-09 04:31:26.000000000 +0000 ++++ module-init-tools-3.2-pre9/configure.in 2005-09-20 22:06:10.000000000 +0000 +@@ -41,5 +41,14 @@ + fi]) + AC_SUBST(MODULE_DIR) + +-AC_OUTPUT([Makefile]) ++AC_ARG_ENABLE(manpages, ++[ --disable-manpages Disable man page generation.], ++[if test x"$enableval" != x"no"; then ++ enable_manpages=yes ++else ++ enable_manpages=no ++fi], ++[enable_manpages=yes]) ++AM_CONDITIONAL([MANPAGES], test x"$enable_manpages" = x"yes") + ++AC_OUTPUT([Makefile]) +Index: module-init-tools-3.2-pre9/Makefile.am +=================================================================== +--- module-init-tools-3.2-pre9.orig/Makefile.am 2005-08-09 04:54:28.000000000 +0000 ++++ module-init-tools-3.2-pre9/Makefile.am 2005-09-20 22:09:03.000000000 +0000 +@@ -21,13 +21,14 @@ + MAN5 = modprobe.conf.5 modules.dep.5 + MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8 + SGML = $(addprefix doc/, $(MAN5:%.5=%.sgml) $(MAN8:%.8=%.sgml)) +-man_MANS = $(MAN5) $(MAN8) + # If they haven't overridden mandir, fix it (never /man!) + mandir =$(shell if [ @mandir@ = $(prefix)/man ]; then if [ $(prefix) = / ]; then echo /usr/share/man; else echo $(prefix)/share/man; fi; else echo @mandir@; fi) + + TESTSUITE := $(shell find tests -type f ! -name '*~') tests/vg-suppressions + +-EXTRA_DIST = generate-modprobe.conf modprobe.devfs FAQ CODING stress_modules.sh install-with-care $(SGML) $(man_MANS) $(TESTSUITE) ++if MANPAGES ++man_MANS = $(MAN5) $(MAN8) ++endif + + sbin_PROGRAMS = insmod modprobe rmmod depmod modinfo insmod.static + bin_PROGRAMS = lsmod 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 000000000..bbd8cca1b --- /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 +} -- cgit v1.2.3