[oe-commits] org.oe.dev merge of '6d161d4303314c43fd7d0d04ac9394cb58e8d2bc'
oe commit
openembedded-commits at lists.openembedded.org
Sat Dec 8 20:50:20 UTC 2007
merge of '6d161d4303314c43fd7d0d04ac9394cb58e8d2bc'
and '754f491e90085be59caba57db33c41de63535015'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 7b02b1b8c73d22c46b4c5534f738668d1def0918
ViewMTN: http://monotone.openembedded.org/revision/info/7b02b1b8c73d22c46b4c5534f738668d1def0918
Files:
1
packages/directfb/files/fix-configure-include-path.patch
packages/directfb/directfb_1.1.0.bb
packages/mesa/mesa-7.0.2
packages/mesa/mesa-7.0.2/fix-host-compile.patch
packages/mesa/mesa-7.0.2/mklib-rpath-link.patch
packages/mesa/mesa_7.0.2.bb
packages/tasks/task-devimage.bb
packages/xorg-driver/xf86-video-ati_6.7.196.bb
packages/xorg-driver/xf86-video-vmware_10.15.2.bb
packages/xorg-driver/xf86-video-xgi_1.5.0.bb
classes/kernel.bbclass
conf/distro/angstrom-2007.1.conf
conf/distro/angstrom-2008.1.conf
conf/machine/aximx50.conf
conf/machine/h2200.conf
conf/machine/h3600.conf
conf/machine/h4000.conf
conf/machine/htcuniversal.conf
conf/machine/hx4700.conf
conf/machine/magician.conf
packages/dropbear/dropbear-early_1.0.bb
packages/gpe-themes/gpe-theme-clearlooks_0.2.bb
packages/gpe-themes/gpe-theme-clearlooks_0.3.bb
packages/gpe-themes/gpe-theme-industrial_0.1.bb
packages/gpe-themes/gpe-theme-industrial_0.2.bb
packages/images/devimage-image.bb
packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb
packages/linux/linux-rp_2.6.17.bb
packages/linux/linux-rp_2.6.21.bb
packages/linux/linux-rp_2.6.22.bb
packages/mesa/mesa-dri_6.5.2.bb
packages/tasks/task-base.bb
Diffs:
#
# mt diff -r6d161d4303314c43fd7d0d04ac9394cb58e8d2bc -r7b02b1b8c73d22c46b4c5534f738668d1def0918
#
#
#
# delete "packages/directfb/files/fix-configure-include-path.patch"
#
# patch "packages/directfb/directfb_1.1.0.bb"
# from [b13ed5a2cee07ae6410cd0eddde2ccbd14dd6b79]
# to [25f7e8fa7c45ad4eea75025c5729c6e356a1be37]
#
============================================================
--- packages/directfb/directfb_1.1.0.bb b13ed5a2cee07ae6410cd0eddde2ccbd14dd6b79
+++ packages/directfb/directfb_1.1.0.bb 25f7e8fa7c45ad4eea75025c5729c6e356a1be37
@@ -12,7 +12,6 @@ SRC_URI = " \
SRC_URI = " \
http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \
- file://fix-configure-include-path.patch;patch=1 \
file://fix-pkgconfig-cflags.patch;patch=1 \
file://fix-font-missing-char.patch;patch=1 \
file://getpagesize.patch;patch=1 \
@@ -37,8 +36,6 @@ do_stage() {
do_stage() {
autotools_stage_all
- # fix breakage introduced with the fix-includes patch, it seems that directfb examples is the only app that looks in the wrong location :/
- ln -sf ${STAGING_LIBDIR} ${STAGING_LIBDIR}/directfb
}
do_install() {
#
# mt diff -r754f491e90085be59caba57db33c41de63535015 -r7b02b1b8c73d22c46b4c5534f738668d1def0918
#
#
#
# add_dir "packages/mesa/mesa-7.0.2"
#
# add_file "packages/mesa/mesa-7.0.2/fix-host-compile.patch"
# content [b099c7506653362001d76f153df4dd8e9a295fc6]
#
# add_file "packages/mesa/mesa-7.0.2/mklib-rpath-link.patch"
# content [e07f79e6c39f88f2db2d828b3d5c928a3feb9a7f]
#
# add_file "packages/mesa/mesa_7.0.2.bb"
# content [3c595509d02a39aca25ae243b05264a535767985]
#
# add_file "packages/tasks/task-devimage.bb"
# content [63338e74dabf0db1286b9ec7c451d8c5d74f36bd]
#
# add_file "packages/xorg-driver/xf86-video-ati_6.7.196.bb"
# content [a5d730e0a406f5ff8c5e5388053285718be0b15d]
#
# add_file "packages/xorg-driver/xf86-video-vmware_10.15.2.bb"
# content [a5d730e0a406f5ff8c5e5388053285718be0b15d]
#
# add_file "packages/xorg-driver/xf86-video-xgi_1.5.0.bb"
# content [a5d730e0a406f5ff8c5e5388053285718be0b15d]
#
# patch "classes/kernel.bbclass"
# from [b007ea6e7cf851bdd43779543a515f368d695509]
# to [63f744845e75d5fb5dae11b765f31d30ad820ace]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [781a9a9775be71ff7f91c9abe1fb7a8c7af4b061]
# to [51d134740207cc8be525f395282e27da28429f03]
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [2de9c3aa70e1a4887beb6ecfaa3bcc8727c3e126]
# to [48eeeef2da4e7f0a0dd6bb78271647732c326f66]
#
# patch "conf/machine/aximx50.conf"
# from [1cb21ff34a007017cdd242f2096aa1e4ef1a3b12]
# to [f066e6fbea0223b5815c3622804f93c0b18d56ee]
#
# patch "conf/machine/h2200.conf"
# from [26ae84016d9f008f9ddece62dba5fa41dc982c31]
# to [dbbf175b117be5072305298eb83c9da4db932774]
#
# patch "conf/machine/h3600.conf"
# from [0e1eab15b3887f17c14b3a824d2c96a447d2ee3a]
# to [99592d7e77fd317519f43f5db57cf5da1814b1a0]
#
# patch "conf/machine/h4000.conf"
# from [815610e0013bc849d757cb2b6589136864d8e04a]
# to [6c7b95aedd50d9f49088b0f0d050dba11b72af1a]
#
# patch "conf/machine/htcuniversal.conf"
# from [b9678e7e01aac968b7e658323a6544aaecf39abb]
# to [ed21482af85e14b44ba36c3a1957e387fb4f0299]
#
# patch "conf/machine/hx4700.conf"
# from [8bd11bb54cb42e00dabf0bf4bdd4387aced4c0a5]
# to [1181931b2a5904b7567bc19b2442b84fec80033a]
#
# patch "conf/machine/magician.conf"
# from [11824fa922d1925fe9b00525aa262b06a13767d1]
# to [1ae98222e011e1527f45541f6e78db64c18e0824]
#
# patch "packages/dropbear/dropbear-early_1.0.bb"
# from [cdaf892564086415c02630de43886143350b375b]
# to [5b7702b9d74427e400988330fbd7c6fcff176371]
#
# patch "packages/gpe-themes/gpe-theme-clearlooks_0.2.bb"
# from [42cae13beeef92ffecdfab057d80dd65f347acc9]
# to [7235422886edcdd89c372f0e20d22f73fb64dab1]
#
# patch "packages/gpe-themes/gpe-theme-clearlooks_0.3.bb"
# from [05bf0deeddefc643695b7d17ca5ab395742a65a5]
# to [1152dddecf9651fc2424a83833df8092bcd28436]
#
# patch "packages/gpe-themes/gpe-theme-industrial_0.1.bb"
# from [8100ed6a19b3bdaf27f1e9e37a3fc67a7a6a583a]
# to [fd01be450b7531e5e13017081570b06cec4adb31]
#
# patch "packages/gpe-themes/gpe-theme-industrial_0.2.bb"
# from [b59529b4e889047353b69b6e96169f1074cacfb2]
# to [1957b58631f76b6d311775a94d010e68ab9e4194]
#
# patch "packages/images/devimage-image.bb"
# from [0ad21673974579715377822a74cb6ea99dc0b14a]
# to [12d7a37e95048665de418bb60826e85fc9e1c979]
#
# patch "packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb"
# from [252b9c26ddd2fda4271f4352999ce0facbfece99]
# to [07839c0797b5ba09b5aae7fcdbb3232965b3f8e3]
#
# patch "packages/linux/linux-rp_2.6.17.bb"
# from [1e091bd34d98eb0a943a7ad227b3f9428a35c721]
# to [4c13420a2f472b063d4a3911cbf71dac33463e44]
#
# patch "packages/linux/linux-rp_2.6.21.bb"
# from [0c168c0cccea7b91c96d3883e69486337818106c]
# to [aa7370a28343ffa48a4725518e97cc7407f2d7d1]
#
# patch "packages/linux/linux-rp_2.6.22.bb"
# from [8a34ec5f81848cec7da4097bdcd7883611b3dcf0]
# to [acbe4f75ccc973360308a4eb4bfc4071a439ddb4]
#
# patch "packages/mesa/mesa-dri_6.5.2.bb"
# from [1299958d4dcad72309d4b58d318e700eac2a4aa0]
# to [52f888551f42e13c2bbb0e72aacb6e76e146ab4b]
#
# patch "packages/tasks/task-base.bb"
# from [b2a95f7d8e72d2e4046a8e35491b379a2bbd4e2c]
# to [784db9539c99a3dfc0ce43cc4b61f9cd5eba3b27]
#
============================================================
--- packages/mesa/mesa-7.0.2/fix-host-compile.patch b099c7506653362001d76f153df4dd8e9a295fc6
+++ packages/mesa/mesa-7.0.2/fix-host-compile.patch b099c7506653362001d76f153df4dd8e9a295fc6
@@ -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
============================================================
--- packages/mesa/mesa-7.0.2/mklib-rpath-link.patch e07f79e6c39f88f2db2d828b3d5c928a3feb9a7f
+++ packages/mesa/mesa-7.0.2/mklib-rpath-link.patch e07f79e6c39f88f2db2d828b3d5c928a3feb9a7f
@@ -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
+
+
+
============================================================
--- packages/mesa/mesa_7.0.2.bb 3c595509d02a39aca25ae243b05264a535767985
+++ packages/mesa/mesa_7.0.2.bb 3c595509d02a39aca25ae243b05264a535767985
@@ -0,0 +1,6 @@
+include mesa-mesa.inc
+
+SRC_URI_append = " file://fix-host-compile.patch;patch=1 "
+
+
+
============================================================
--- packages/tasks/task-devimage.bb 63338e74dabf0db1286b9ec7c451d8c5d74f36bd
+++ packages/tasks/task-devimage.bb 63338e74dabf0db1286b9ec7c451d8c5d74f36bd
@@ -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} \
+ "
============================================================
--- packages/xorg-driver/xf86-video-ati_6.7.196.bb a5d730e0a406f5ff8c5e5388053285718be0b15d
+++ packages/xorg-driver/xf86-video-ati_6.7.196.bb a5d730e0a406f5ff8c5e5388053285718be0b15d
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
============================================================
--- packages/xorg-driver/xf86-video-vmware_10.15.2.bb a5d730e0a406f5ff8c5e5388053285718be0b15d
+++ packages/xorg-driver/xf86-video-vmware_10.15.2.bb a5d730e0a406f5ff8c5e5388053285718be0b15d
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
============================================================
--- packages/xorg-driver/xf86-video-xgi_1.5.0.bb a5d730e0a406f5ff8c5e5388053285718be0b15d
+++ packages/xorg-driver/xf86-video-xgi_1.5.0.bb a5d730e0a406f5ff8c5e5388053285718be0b15d
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
============================================================
--- classes/kernel.bbclass b007ea6e7cf851bdd43779543a515f368d695509
+++ classes/kernel.bbclass 63f744845e75d5fb5dae11b765f31d30ad820ace
@@ -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))
============================================================
--- conf/distro/angstrom-2007.1.conf 781a9a9775be71ff7f91c9abe1fb7a8c7af4b061
+++ conf/distro/angstrom-2007.1.conf 51d134740207cc8be525f395282e27da28429f03
@@ -1,8 +1,8 @@
#@--------------------------------------------------------------------
#@TYPE: Distribution
#@NAME: Angstrom <http://www.angstrom-distribution.org>
#@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices
-#@MAINTAINER: Koen Kooi <koen at dominion.kabel.utwente.nl>
+#@MAINTAINER: Koen Kooi <koen at openembedded.org>
#@MAINTAINER: Michael 'Mickey' Lauer <mickey at Vanille.de>
#@--------------------------------------------------------------------
============================================================
--- conf/distro/angstrom-2008.1.conf 2de9c3aa70e1a4887beb6ecfaa3bcc8727c3e126
+++ conf/distro/angstrom-2008.1.conf 48eeeef2da4e7f0a0dd6bb78271647732c326f66
@@ -1,8 +1,8 @@
#@--------------------------------------------------------------------
#@TYPE: Distribution
#@NAME: Angstrom <http://www.angstrom-distribution.org>
#@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices
-#@MAINTAINER: Koen Kooi <koen at dominion.kabel.utwente.nl>
+#@MAINTAINER: Koen Kooi <koen at openembedded.org>
#@MAINTAINER: Michael 'Mickey' Lauer <mickey at Vanille-media.de>
#@--------------------------------------------------------------------
============================================================
--- conf/machine/aximx50.conf 1cb21ff34a007017cdd242f2096aa1e4ef1a3b12
+++ conf/machine/aximx50.conf f066e6fbea0223b5815c3622804f93c0b18d56ee
@@ -32,10 +32,7 @@ MACHINE_EXTRA_RDEPENDS = "tiinit acx-fir
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"
#
============================================================
--- conf/machine/h2200.conf 26ae84016d9f008f9ddece62dba5fa41dc982c31
+++ conf/machine/h2200.conf dbbf175b117be5072305298eb83c9da4db932774
@@ -27,12 +27,19 @@ MACHINE_EXTRA_RDEPENDS = "h2200-bootload
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"
============================================================
--- conf/machine/h3600.conf 0e1eab15b3887f17c14b3a824d2c96a447d2ee3a
+++ conf/machine/h3600.conf 99592d7e77fd317519f43f5db57cf5da1814b1a0
@@ -27,33 +27,12 @@ MACHINE_EXTRA_RDEPENDS = "ipaq-boot-para
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
#
SERIAL_CONSOLE = "115200 ttySA0 vt100"
============================================================
--- conf/machine/h4000.conf 815610e0013bc849d757cb2b6589136864d8e04a
+++ conf/machine/h4000.conf 6c7b95aedd50d9f49088b0f0d050dba11b72af1a
@@ -26,8 +26,9 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modu
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 @@ module_autoload_snd-mixer-oss = "snd-mix
#
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"
============================================================
--- conf/machine/htcuniversal.conf b9678e7e01aac968b7e658323a6544aaecf39abb
+++ conf/machine/htcuniversal.conf ed21482af85e14b44ba36c3a1957e387fb4f0299
@@ -28,11 +28,7 @@ MACHINE_EXTRA_RDEPENDS = "tiinit acx-fir
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 \
============================================================
--- conf/machine/hx4700.conf 8bd11bb54cb42e00dabf0bf4bdd4387aced4c0a5
+++ conf/machine/hx4700.conf 1181931b2a5904b7567bc19b2442b84fec80033a
@@ -34,10 +34,7 @@ MACHINE_EXTRA_RDEPENDS = "tiinit acx-fir
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 \
============================================================
--- conf/machine/magician.conf 11824fa922d1925fe9b00525aa262b06a13767d1
+++ conf/machine/magician.conf 1ae98222e011e1527f45541f6e78db64c18e0824
@@ -41,7 +41,6 @@ MACHINE_EXTRA_RRECOMMENDS = " \
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 \
============================================================
--- packages/dr%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list