diff options
| -rw-r--r-- | packages/linux/nslu2-kernel_2.6.12.2.bb | 2 | ||||
| -rw-r--r-- | packages/linux/openslug-kernel-2.6.12.2/defconfig | 9 | ||||
| -rw-r--r-- | packages/module-init-tools/module-init-tools-3.2-pre9/.mtn2git_empty (renamed from packages/module-init-tools/module-init-tools-3.2-pre7/.mtn2git_empty) | 0 | ||||
| -rw-r--r-- | packages/module-init-tools/module-init-tools-3.2-pre9/ignore_arch_directory (renamed from packages/module-init-tools/module-init-tools-3.2-pre7/ignore_arch_directory) | 0 | ||||
| -rw-r--r-- | packages/module-init-tools/module-init-tools-3.2-pre9/manpagesopt (renamed from packages/module-init-tools/module-init-tools-3.2-pre7/manpagesopt) | 14 | ||||
| -rw-r--r-- | packages/module-init-tools/module-init-tools_3.2-pre9.bb (renamed from packages/module-init-tools/module-init-tools_3.2-pre7.bb) | 6 | ||||
| -rw-r--r-- | packages/pcmciautils/pcmciautils_010.bb | 10 | ||||
| -rw-r--r-- | packages/tslib/tslib/h3900/tslib.sh | 10 | ||||
| -rw-r--r-- | packages/tslib/tslib_cvs.bb | 6 |
9 files changed, 25 insertions, 32 deletions
diff --git a/packages/linux/nslu2-kernel_2.6.12.2.bb b/packages/linux/nslu2-kernel_2.6.12.2.bb index 6f0f400028..e574f86d56 100644 --- a/packages/linux/nslu2-kernel_2.6.12.2.bb +++ b/packages/linux/nslu2-kernel_2.6.12.2.bb @@ -1,5 +1,5 @@ # Kernel for NSLU2 -PR = "r16" +PR = "r17" include nslu2-kernel.inc # N2K_EXTRA_PATCHES - list of patches to apply (can include diff --git a/packages/linux/openslug-kernel-2.6.12.2/defconfig b/packages/linux/openslug-kernel-2.6.12.2/defconfig index 51434a652d..548ce0e3c6 100644 --- a/packages/linux/openslug-kernel-2.6.12.2/defconfig +++ b/packages/linux/openslug-kernel-2.6.12.2/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.12.2 -# Fri Sep 16 22:26:41 2005 +# Mon Sep 19 00:54:57 2005 # CONFIG_ARM=y CONFIG_MMU=y @@ -968,10 +968,13 @@ CONFIG_SOUND=m # Advanced Linux Sound Architecture # CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_RAWMIDI=m # CONFIG_SND_SEQUENCER is not set CONFIG_SND_OSSEMUL=y CONFIG_SND_MIXER_OSS=m -# CONFIG_SND_PCM_OSS is not set +CONFIG_SND_PCM_OSS=m # CONFIG_SND_RTCTIMER is not set # CONFIG_SND_VERBOSE_PRINTK is not set # CONFIG_SND_DEBUG is not set @@ -1034,7 +1037,7 @@ CONFIG_SND_MIXER_OSS=m # # USB devices # -# CONFIG_SND_USB_AUDIO is not set +CONFIG_SND_USB_AUDIO=m # # Open Sound System diff --git a/packages/module-init-tools/module-init-tools-3.2-pre7/.mtn2git_empty b/packages/module-init-tools/module-init-tools-3.2-pre9/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/module-init-tools/module-init-tools-3.2-pre7/.mtn2git_empty +++ b/packages/module-init-tools/module-init-tools-3.2-pre9/.mtn2git_empty diff --git a/packages/module-init-tools/module-init-tools-3.2-pre7/ignore_arch_directory b/packages/module-init-tools/module-init-tools-3.2-pre9/ignore_arch_directory index 185ea7a3a5..185ea7a3a5 100644 --- a/packages/module-init-tools/module-init-tools-3.2-pre7/ignore_arch_directory +++ b/packages/module-init-tools/module-init-tools-3.2-pre9/ignore_arch_directory diff --git a/packages/module-init-tools/module-init-tools-3.2-pre7/manpagesopt b/packages/module-init-tools/module-init-tools-3.2-pre9/manpagesopt index ee1454c6ef..5d5cac609e 100644 --- a/packages/module-init-tools/module-init-tools-3.2-pre7/manpagesopt +++ b/packages/module-init-tools/module-init-tools-3.2-pre9/manpagesopt @@ -1,7 +1,7 @@ -Index: module-init-tools-3.1/configure.in +Index: module-init-tools-3.2-pre9/configure.in =================================================================== ---- module-init-tools-3.1.orig/configure.in 2004-11-12 00:05:25.000000000 -0500 -+++ module-init-tools-3.1/configure.in 2005-01-20 02:23:16.409792288 -0500 +--- 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) @@ -18,8 +18,10 @@ Index: module-init-tools-3.1/configure.in +AM_CONDITIONAL([MANPAGES], test x"$enable_manpages" = x"yes") +AC_OUTPUT([Makefile]) ---- module-init-tools-3.2-pre7/Makefile.am.orig 2005-07-05 13:55:06.000000000 +0200 -+++ module-init-tools-3.2-pre7/Makefile.am 2005-07-05 13:55:31.000000000 +0200 +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 @@ -28,7 +30,7 @@ Index: module-init-tools-3.1/configure.in # 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 '*~') + 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 diff --git a/packages/module-init-tools/module-init-tools_3.2-pre7.bb b/packages/module-init-tools/module-init-tools_3.2-pre9.bb index 017f288e7d..bbd8cca1bf 100644 --- a/packages/module-init-tools/module-init-tools_3.2-pre7.bb +++ b/packages/module-init-tools/module-init-tools_3.2-pre9.bb @@ -3,7 +3,7 @@ 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 = "r1" +PR = "r0" PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod" RDEPENDS_${PN} += "module-init-tools-depmod" @@ -36,7 +36,7 @@ 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 20 + 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 @@ -54,7 +54,7 @@ update-alternatives --remove lsmod /bin/lsmod.26 pkg_postinst_module-init-tools-depmod() { #!/bin/sh -update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 20 +update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 60 } pkg_prerm_module-init-tools() { diff --git a/packages/pcmciautils/pcmciautils_010.bb b/packages/pcmciautils/pcmciautils_010.bb index f619a98235..385ccd9d95 100644 --- a/packages/pcmciautils/pcmciautils_010.bb +++ b/packages/pcmciautils/pcmciautils_010.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel 2.6 Userland Utilities for the PCMCIA Subsystem" DEPENDS = "sysfsutils udev" -RDEPENDS = "udev" +RDEPENDS = "udev module-init-tools" HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" SECTION = "kernel/userland" PRIORITY = "optional" @@ -8,15 +8,11 @@ PRIORITY = "optional" SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2" S = "${WORKDIR}/pcmciautils-${PV}" -PR = "r1" - -inherit update-rc.d - -INITSCRIPT_NAME = "coldplug" -INITSCRIPT_PARAMS = "defaults" +PR = "r2" export HOSTCC = "${BUILD_CC}" export etcdir = "${sysconfdir}" +export sbindir = "${base_sbindir}" export pcmciaconfdir = "${sysconfdir}/pcmcia" export udevrulesdir = "${sysconfdir}/udev/rules.d" export UDEV = 1 diff --git a/packages/tslib/tslib/h3900/tslib.sh b/packages/tslib/tslib/h3900/tslib.sh index c885ccc9d2..be9448b1dc 100644 --- a/packages/tslib/tslib/h3900/tslib.sh +++ b/packages/tslib/tslib/h3900/tslib.sh @@ -11,15 +11,7 @@ case `uname -r` in ;; *) TSLIB_TSDEVICE=`detect-stylus --device` - case `module_id` in - "HP iPAQ H2200") - # h2200 needs special linearizing thing - TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h2200 - ;; - *) - TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600 - ;; - esac + TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600 ;; esac diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb index 5c52147e1c..9e6c4e26d3 100644 --- a/packages/tslib/tslib_cvs.bb +++ b/packages/tslib/tslib_cvs.bb @@ -1,7 +1,7 @@ SECTION = "base" DESCRIPTION = "tslib is a touchscreen access library." PV = "0.0cvs${CVSDATE}" -PR = "r31" +PR = "r32" SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" PACKAGE_ARCH_tslib-conf = "${MACHINE}" @@ -9,7 +9,7 @@ PACKAGE_ARCH_mnci = "${MACHINE}" SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \ file://ts.conf \ - file://ts.conf-h3600 file://ts.conf-h3600-2.4 file://ts.conf-h2200 file://ts.conf-h6300 \ + file://ts.conf-h3600 file://ts.conf-h3600-2.4 file://ts.conf-h6300 \ file://ts.conf-corgi file://ts.conf-corgi-2.4 \ file://tslib.sh" SRC_URI_append_mnci += " file://devfs.patch;patch=1" @@ -42,7 +42,7 @@ do_install_append() { case ${MACHINE} in h3600 | h3900 | h1940 | h6300 | ipaq-pxa270) install -d ${D}${datadir}/tslib - for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h2200 ts.conf-h6300; do + for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h6300; do install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ done rm -f ${D}${sysconfdir}/ts.conf |