summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--classes/kernel.bbclass5
-rw-r--r--conf/machine/aximx50.conf5
-rw-r--r--conf/machine/h2200.conf7
-rw-r--r--conf/machine/h3600.conf23
-rw-r--r--conf/machine/h4000.conf5
-rw-r--r--conf/machine/htcuniversal.conf6
-rw-r--r--conf/machine/hx4700.conf5
-rw-r--r--conf/machine/magician.conf1
-rw-r--r--packages/dropbear/dropbear-early_1.0.bb3
-rw-r--r--packages/images/devimage-image.bb8
-rw-r--r--packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb2
-rw-r--r--packages/linux/linux-rp_2.6.17.bb2
-rw-r--r--packages/linux/linux-rp_2.6.21.bb2
-rw-r--r--packages/linux/linux-rp_2.6.22.bb2
-rw-r--r--packages/tasks/task-base.bb3
-rw-r--r--packages/tasks/task-devimage.bb25
16 files changed, 53 insertions, 51 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 5976f42c71..c00d0f3f58 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -349,6 +349,9 @@ python populate_packages_prepend () {
# If autoloading is requested, output /etc/modutils/<name> and append
# appropriate modprobe commands to the postinst
autoload = bb.data.getVar('module_autoload_%s' % basename, d, 1)
+ if not autoload:
+ # Also, try canonical name with dashes
+ autoload = bb.data.getVar('module_autoload_%s' % basename.replace('_', '-'), d, 1)
if autoload:
name = '%s/etc/modutils/%s' % (dvar, basename)
f = open(name, 'w')
@@ -400,7 +403,7 @@ python populate_packages_prepend () {
metapkg = "kernel-modules"
bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d)
bb.data.setVar('FILES_' + metapkg, "", d)
- blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base' ]
+ blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux' ]
for l in module_deps.values():
for i in l:
pkg = module_pattern % legitimize_package_name(re.match(module_regex, os.path.basename(i)).group(1))
diff --git a/conf/machine/aximx50.conf b/conf/machine/aximx50.conf
index 0dda9492e9..b119a24359 100644
--- a/conf/machine/aximx50.conf
+++ b/conf/machine/aximx50.conf
@@ -32,10 +32,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_VERSION_orinoco-modules = "0.15rc1"
MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware"
-MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \
- kernel-module-nls-iso8859-1 \
- kernel-module-nls-utf8 \
- kernel-module-af-key \
+MACHINE_EXTRA_RRECOMMENDS = "\
kernel-module-i2c-pxa"
#
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index 60a732ffa6..c149da18fa 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -27,12 +27,19 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
MACHINE_EXTRA_RDEPENDS = "h2200-bootloader udev-hostap-cs-vcc-workaround"
+MACHINE_EXTRA_RRECOMMENDS = "\
+ kernel-module-snd-h2200-audio \
+ kernel-module-i2c-pxa \
+ "
+
EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000"
#
# Modules autoload and other boot properties
#
module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_snd-mixer-oss = "snd-mixer-oss"
+module_autoload_snd-h2000-audio = "snd-h2000-audio"
SERIAL_CONSOLE = "115200 ttyS0 vt100"
USE_VT = "0"
diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
index 9cf8272b51..1fcaf664d4 100644
--- a/conf/machine/h3600.conf
+++ b/conf/machine/h3600.conf
@@ -27,32 +27,11 @@ PCMCIA_MANAGER = "pcmciautils"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
MACHINE_EXTRA_RDEPENDS = "ipaq-boot-params"
-MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \
+MACHINE_EXTRA_RRECOMMENDS = "\
kernel-module-micro"
EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME} ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl"
-
-
-# TODO: see if any of these modules have 2.6 counterparts
-# and need to be RRECOMMENDED
-#
-#H3600_MODULES = "\
-#h3600-asic \
-#hwtimer \
-#nvrd \
-#sa1100-cs \
-#sa1100-ir \
-#sa1100-wdt \
-#sa1100-audio \
-#sa1100-rtc \
-#sa1100usb-core \
-#sd-mod \
-#serial-h3800 \
-#"
-
-
-
#
# Modules autoload and other boot properties
#
diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf
index f56bee00e8..0683498c5f 100644
--- a/conf/machine/h4000.conf
+++ b/conf/machine/h4000.conf
@@ -26,8 +26,9 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware ${PCMCIA_MANAGER}"
MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-h4000-audio \
- kernel-module-h4000-pcmcia \
kernel-module-i2c-pxa \
+ kernel-module-h4000-bt \
+ kernel-module-h4000-pcmcia \
kernel-module-acx \
"
@@ -36,7 +37,7 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-h4000-audio \
#
module_autoload_snd-pcm-oss = "snd-pcm-oss"
module_autoload_snd-mixer-oss = "snd-mixer-oss"
-module_autoload_snd-h4000_audio = "snd-h4000_audio"
+module_autoload_snd-h4000-audio = "snd-h4000-audio"
module_autoload_g_ether = "g_ether"
module_conf_acx = "blacklist acx"
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index c3e7cf710e..b7b9b5cdc0 100644
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -28,11 +28,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
XSERVER = "xserver-kdrive-fbdev"
MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware"
-MACHINE_EXTRA_RRECOMMENDS = " kernel-module-nls-cp437 \
- kernel-module-nls-iso8859-1 \
- kernel-module-nls-utf8 \
- kernel-module-af-key \
- kernel-module-bsd-comp \
+MACHINE_EXTRA_RRECOMMENDS = "\
kernel-module-i2c-pxa \
kernel-module-snd-htcuniversal-audio \
kernel-module-htcuniversal-acx \
diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index 87e03a7bdd..daa74866b2 100644
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -34,10 +34,7 @@ XSERVER = "xserver-kdrive-w100"
PREFERRED_VERSION_orinoco-modules = "0.15rc1"
MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware"
-MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \
- kernel-module-nls-iso8859-1 \
- kernel-module-nls-utf8 \
- kernel-module-af-key \
+MACHINE_EXTRA_RRECOMMENDS = "\
kernel-module-i2c-pxa \
kernel-module-pxa27x-voltage \
kernel-module-pxa27x-voltage-max158xx \
diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf
index 900b24b751..e099825a40 100644
--- a/conf/machine/magician.conf
+++ b/conf/machine/magician.conf
@@ -41,7 +41,6 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
PREFERRED_VERSION_orinoco-modules = "0.15rc1"
MACHINE_EXTRA_RRECOMMENDS = " \
- kernel-module-af-key \
kernel-module-i2c-pxa \
kernel-module-pxa27x-voltage \
kernel-module-pxa27x-voltage-max158xx \
diff --git a/packages/dropbear/dropbear-early_1.0.bb b/packages/dropbear/dropbear-early_1.0.bb
index 651d1327ca..df2c2dc26f 100644
--- a/packages/dropbear/dropbear-early_1.0.bb
+++ b/packages/dropbear/dropbear-early_1.0.bb
@@ -1,6 +1,7 @@
DESCRIPTION = "Allow to start dropbear soon after boot, depending on kernel command line option."
SECTION = "devel"
-PR = "r1"
+PR = "r2"
+RDEPENDS = "dropbear"
SRC_URI = "file://dropbear-early"
diff --git a/packages/images/devimage-image.bb b/packages/images/devimage-image.bb
index 6a3e60c5e3..cecd98d644 100644
--- a/packages/images/devimage-image.bb
+++ b/packages/images/devimage-image.bb
@@ -3,12 +3,8 @@
# only shell and dropbear are loaded by default.
# Allows to login via serial and real console or SSH
-DEVIMAGE_EXTRA_RDEPENDS ?= ""
-IMAGE_INSTALL = "devimage busybox dropbear udev \
- module-init-tools pcmciautils \
- wireless-tools wpa-supplicant \
- irda-utils acx-firmware \
- ${DEVIMAGE_EXTRA_RDEPENDS}"
+DEPENDS = "task-devimage"
+IMAGE_INSTALL = "task-devimage"
export IMAGE_BASENAME = "devimage"
IMAGE_LINGUAS = ""
diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb
index b34d4630a0..ec5844bfb5 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb
@@ -1,7 +1,7 @@
SECTION = "kernel"
DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
DEFAULT_PREFERENCE = "-1"
diff --git a/packages/linux/linux-rp_2.6.17.bb b/packages/linux/linux-rp_2.6.17.bb
index 557131e530..de898b3f11 100644
--- a/packages/linux/linux-rp_2.6.17.bb
+++ b/packages/linux/linux-rp_2.6.17.bb
@@ -1,6 +1,6 @@
require linux-rp.inc
-PR = "r37"
+PR = "r38"
DEFAULT_PREFERENCE_poodle = "99"
diff --git a/packages/linux/linux-rp_2.6.21.bb b/packages/linux/linux-rp_2.6.21.bb
index d990a77e48..d239b2aa32 100644
--- a/packages/linux/linux-rp_2.6.21.bb
+++ b/packages/linux/linux-rp_2.6.21.bb
@@ -1,6 +1,6 @@
require linux-rp.inc
-PR = "r11"
+PR = "r12"
DEFAULT_PREFERENCE_poodle = "-99"
DEFAULT_PREFERENCE_collie = "1"
diff --git a/packages/linux/linux-rp_2.6.22.bb b/packages/linux/linux-rp_2.6.22.bb
index 57094b3fb7..55c37af4c9 100644
--- a/packages/linux/linux-rp_2.6.22.bb
+++ b/packages/linux/linux-rp_2.6.22.bb
@@ -1,6 +1,6 @@
require linux-rp.inc
-PR = "r10"
+PR = "r11"
DEFAULT_PREFERENCE_poodle = "-99"
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 03a3fd35b3..33d93f2921 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r48"
+PR = "r50"
inherit task
@@ -160,6 +160,7 @@ RRECOMMENDS_task-base-kernel24 = "\
kernel-module-uinput"
RRECOMMENDS_task-base-kernel26 = "\
+ kernel-module-nls-utf8 \
kernel-module-input \
kernel-module-uinput \
kernel-module-rtc-dev \
diff --git a/packages/tasks/task-devimage.bb b/packages/tasks/task-devimage.bb
new file mode 100644
index 0000000000..bd0c15e70f
--- /dev/null
+++ b/packages/tasks/task-devimage.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Image for development testing"
+PR = "r1"
+LICENSE = "MIT"
+
+inherit task
+
+DEVIMAGE_EXTRA_RDEPENDS ?= ""
+DEVIMAGE_EXTRA_RRECOMMENDS ?= ""
+
+RDEPENDS = "\
+ devimage \
+ busybox dropbear udev \
+ util-linux-mount \
+ module-init-tools pcmciautils \
+ wireless-tools wpa-supplicant \
+ irda-utils acx-firmware \
+ ${DEVIMAGE_EXTRA_RDEPENDS} \
+ "
+
+RRECOMMENDS = "\
+ kernel-module-msdos \
+ kernel-module-vfat \
+ kernel-modules \
+ ${DEVIMAGE_EXTRA_RRECOMMENDS} \
+ "
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-13 19:17:11 +0000