diff options
30 files changed, 139 insertions, 58 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/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 0d5fd4f013..4c9a254cd9 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -2,7 +2,7 @@ #@TYPE: Distribution #@NAME: Angstrom <http://www.angstrom-distribution.org> #@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices -#@MAINTAINER: Koen Kooi <koen@dominion.kabel.utwente.nl> +#@MAINTAINER: Koen Kooi <koen@openembedded.org> #@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de> #@-------------------------------------------------------------------- diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index bc03465bd5..145c463751 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -2,7 +2,7 @@ #@TYPE: Distribution #@NAME: Angstrom <http://www.angstrom-distribution.org> #@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices -#@MAINTAINER: Koen Kooi <koen@dominion.kabel.utwente.nl> +#@MAINTAINER: Koen Kooi <koen@openembedded.org> #@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille-media.de> #@-------------------------------------------------------------------- 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/gpe-themes/gpe-theme-clearlooks_0.2.bb b/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb index 77f8289025..da61845f4d 100644 --- a/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb +++ b/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb @@ -7,7 +7,7 @@ DEPENDS = "gtk-engines" RDEPENDS = "gtk-engine-clearlooks" FILES_${PN} = "${datadir}/themes/" -SRC_URI = "http://dominion.kabel.utwente.nl/koen/pda/files/${P}.tar.gz" +SRC_URI = "http://dominion.thruhere.net/koen/pda/files/${P}.tar.gz" do_install() { install -d ${D}${datadir}/themes/ diff --git a/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb b/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb index 0ec4e10338..33712c70ee 100644 --- a/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb +++ b/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb @@ -6,7 +6,7 @@ DEPENDS = "gtk-engines" RDEPENDS = "gtk-engine-clearlooks" FILES_${PN} = "${datadir}/themes/" -SRC_URI = "http://dominion.kabel.utwente.nl/koen/pda/files/${P}.tar.gz" +SRC_URI = "http://dominion.thruhere.net/koen/pda/files/${P}.tar.gz" do_install() { install -d ${D}${datadir}/themes/ diff --git a/packages/gpe-themes/gpe-theme-industrial_0.1.bb b/packages/gpe-themes/gpe-theme-industrial_0.1.bb index 1a57e03d03..8a455de250 100644 --- a/packages/gpe-themes/gpe-theme-industrial_0.1.bb +++ b/packages/gpe-themes/gpe-theme-industrial_0.1.bb @@ -7,7 +7,7 @@ DEPENDS = "gtk-engines" RDEPENDS = "gtk-engine-industrial" FILES_${PN} = "${datadir}/themes/" -SRC_URI = "http://dominion.kabel.utwente.nl/koen/pda/files/${P}.tar.gz" +SRC_URI = "http://dominion.thruhere.net/koen/pda/files/${P}.tar.gz" do_install() { install -d ${D}${datadir}/themes/ diff --git a/packages/gpe-themes/gpe-theme-industrial_0.2.bb b/packages/gpe-themes/gpe-theme-industrial_0.2.bb index 02b7a62c0d..c1cd5ca41d 100644 --- a/packages/gpe-themes/gpe-theme-industrial_0.2.bb +++ b/packages/gpe-themes/gpe-theme-industrial_0.2.bb @@ -6,7 +6,7 @@ DEPENDS = "gtk-engines" RDEPENDS = "gtk-engine-industrial" FILES_${PN} = "${datadir}/themes/" -SRC_URI = "http://dominion.kabel.utwente.nl/koen/pda/files/${P}.tar.gz" +SRC_URI = "http://dominion.thruhere.net/koen/pda/files/${P}.tar.gz" do_install() { install -d ${D}${datadir}/themes/ 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/mesa/mesa-7.0.2/.mtn2git_empty b/packages/mesa/mesa-7.0.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mesa/mesa-7.0.2/.mtn2git_empty diff --git a/packages/mesa/mesa-7.0.2/fix-host-compile.patch b/packages/mesa/mesa-7.0.2/fix-host-compile.patch new file mode 100644 index 0000000000..d24d03d379 --- /dev/null +++ b/packages/mesa/mesa-7.0.2/fix-host-compile.patch @@ -0,0 +1,30 @@ +--- /src/mesa/x86/orig-Makefile 2005-07-01 04:54:38.000000000 +0300 ++++ /src/mesa/x86/Makefile 2007-06-07 21:52:31.000000000 +0300 +@@ -5,6 +5,7 @@ + + + INCLUDE_DIRS = \ ++ -I/usr/include \ + -I$(TOP)/include/GL \ + -I$(TOP)/include \ + -I.. \ +@@ -13,6 +14,10 @@ + -I../glapi \ + -I../tnl + ++OPT_FLAGS_host = -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os ++ ++CFLAGS_host = -Wall -Wmissing-prototypes $(OPT_FLAGS_host) $(PIC_FLAGS) $(ARCH_FLAGS) \ ++ $(DEFINES) $(ASM_FLAGS) $(X11_INCLUDES) -std=c99 -ffast-math + + default: gen_matypes matypes.h + +@@ -21,7 +26,7 @@ + + + gen_matypes: gen_matypes.c +- $(CC) $(INCLUDE_DIRS) $(CFLAGS) gen_matypes.c -o gen_matypes ++ $(CC) $(INCLUDE_DIRS) $(CFLAGS_host) gen_matypes.c -o gen_matypes + + # need some special rules here, unfortunately + matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes diff --git a/packages/mesa/mesa-7.0.2/mklib-rpath-link.patch b/packages/mesa/mesa-7.0.2/mklib-rpath-link.patch new file mode 100644 index 0000000000..618f5b57ed --- /dev/null +++ b/packages/mesa/mesa-7.0.2/mklib-rpath-link.patch @@ -0,0 +1,23 @@ +--- /tmp/mklib 2007-12-08 11:03:23.000000000 +0100 ++++ Mesa-7.0.2/bin/mklib 2007-12-08 11:04:02.509863000 +0100 +@@ -106,6 +106,9 @@ + -L*) + DEPS="$DEPS $1" + ;; ++ -Wl*) ++ DEPS="$DEPS $1" ++ ;; + -pthread) + # this is a special case (see bugzilla 10876) + DEPS="$DEPS $1" +--- /tmp/default 2007-12-08 11:04:17.000000000 +0100 ++++ Mesa-7.0.2/configs/default 2007-12-08 11:05:06.279863000 +0100 +@@ -76,7 +76,7 @@ + GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11 + + # Program dependencies - specific GL/glut libraries added in Makefiles +-APP_LIB_DEPS = -lm ++APP_LIB_DEPS = $(EXTRA_LIB_PATH) -lm + + + diff --git a/packages/mesa/mesa-dri_6.5.2.bb b/packages/mesa/mesa-dri_6.5.2.bb index 9255a926e9..fffbfee780 100644 --- a/packages/mesa/mesa-dri_6.5.2.bb +++ b/packages/mesa/mesa-dri_6.5.2.bb @@ -4,9 +4,11 @@ FILESPATH = "${FILE_DIRNAME}/mesa-${PV}:${FILE_DIRNAME}/files:${FILE_DIRNAME}" PACKAGES_DYNAMIC = "mesa-dri-driver-*" -PR = "r0" +PR = "r1" DEPENDS += "libdrm" +# DRI is useless without the kernel drivers +RRECOMMENDS += " kernel-module-drm kernel-module-radeon " do_configure() { cd configs diff --git a/packages/mesa/mesa_7.0.2.bb b/packages/mesa/mesa_7.0.2.bb new file mode 100644 index 0000000000..3eb1fbef8b --- /dev/null +++ b/packages/mesa/mesa_7.0.2.bb @@ -0,0 +1,6 @@ +include mesa-mesa.inc + +SRC_URI_append = " file://fix-host-compile.patch;patch=1 " + + + 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} \ + " diff --git a/packages/xorg-driver/xf86-video-ati_6.7.196.bb b/packages/xorg-driver/xf86-video-ati_6.7.196.bb new file mode 100644 index 0000000000..994b8b6a3c --- /dev/null +++ b/packages/xorg-driver/xf86-video-ati_6.7.196.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" diff --git a/packages/xorg-driver/xf86-video-vmware_10.15.2.bb b/packages/xorg-driver/xf86-video-vmware_10.15.2.bb new file mode 100644 index 0000000000..994b8b6a3c --- /dev/null +++ b/packages/xorg-driver/xf86-video-vmware_10.15.2.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" diff --git a/packages/xorg-driver/xf86-video-xgi_1.5.0.bb b/packages/xorg-driver/xf86-video-xgi_1.5.0.bb new file mode 100644 index 0000000000..994b8b6a3c --- /dev/null +++ b/packages/xorg-driver/xf86-video-xgi_1.5.0.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" |