[oe-commits] org.oe.dev merge of 'abb30fd9e16aeb04aa9b9ec2dc5e3334abbcd527'

oe commit openembedded-commits at lists.openembedded.org
Mon Dec 17 21:34:56 UTC 2007


merge of 'abb30fd9e16aeb04aa9b9ec2dc5e3334abbcd527'
     and 'db54ef97e73876a8f1a87b94c3ccfb09ea36239e'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 72261bebf3bcc785735847f4dbbfa8950cc86e05
ViewMTN: http://monotone.openembedded.org/revision/info/72261bebf3bcc785735847f4dbbfa8950cc86e05
Files:
1
contrib/angstrom/build-release.sh
packages/gcc/files/gcc4-mtune-compat.patch
conf/distro/include/angstrom-2007-preferred-versions.inc
packages/curl/curl_7.16.4.bb
packages/gcc/gcc-cross-sdk_3.4.4.bb
packages/gcc/gcc-cross_3.4.4.bb
packages/gcc/gcc_3.4.4.bb
packages/linux/linux-linkstationarm_2.6.12.bb
packages/linux/linux-linkstationppc_2.6.21-rc5.bb
packages/linux/linux-rp-2.6.22/defconfig-qemux86
packages/linux/linux-rp_2.6.22.bb
packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
packages/linux-libc-headers/linux-libc-headers_2.6.22.bb
packages/linux-libc-headers/linux-libc-headers_2.6.23.bb
packages/ncurses/ncurses/visibility.patch
packages/ncurses/ncurses_5.4.bb
packages/tasks/task-base.bb
packages/uboot/u-boot-mkimage-openmoko-native_oe.bb
packages/uboot/u-boot-utils-native_1.2.0.bb
packages/uboot/u-boot-utils_1.2.0.bb
packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
Diffs:

#
# mt diff -rabb30fd9e16aeb04aa9b9ec2dc5e3334abbcd527 -r72261bebf3bcc785735847f4dbbfa8950cc86e05
#
# 
# 
# patch "contrib/angstrom/build-release.sh"
#  from [8d77a44ca4304a0ee848142edd6f3c86b6abc9ea]
#    to [fcbcc35a1bbbe58855952cff9065301b196efa1a]
# 
============================================================
--- contrib/angstrom/build-release.sh	8d77a44ca4304a0ee848142edd6f3c86b6abc9ea
+++ contrib/angstrom/build-release.sh	fcbcc35a1bbbe58855952cff9065301b196efa1a
@@ -37,14 +37,14 @@ do
 do
 	BUILD_MACHINE=$machine
 	BUILD_CLEAN="libtool-cross"
-	BUILD_TARGETS="minimal-image console-image"
+	BUILD_TARGETS="base-image console-image"
 	do_build
 done
 
 for machine in ixp4xxle ixp4xxbe 
 do
 	BUILD_MACHINE=$machine
-	BUILD_TARGETS="minimal-image nslu2-base-image"
+	BUILD_TARGETS="base-image nslu2-base-image"
 	do_build
 done	 
 
@@ -60,7 +60,7 @@ do
 for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 poodle tosa hx4700 c7x0 spitz akita collie 
 do
 	BUILD_MACHINE=$machine
-	BUILD_TARGETS="minimal-image console-image minimal-gpe-image x11-image"
+	BUILD_TARGETS="base-image console-image minimal-gpe-image x11-image"
 	do_build
 done
 


#
# mt diff -rdb54ef97e73876a8f1a87b94c3ccfb09ea36239e -r72261bebf3bcc785735847f4dbbfa8950cc86e05
#
# 
# 
# add_file "packages/gcc/files/gcc4-mtune-compat.patch"
#  content [7f1c7b590473405ac775e30f798822df399124bb]
# 
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
#  from [2ee34e9004f488e328231f5a1f139e5225d0e2cf]
#    to [9bb6cf26f7a7451d99dda12e51b6584c26194aa5]
# 
# patch "packages/curl/curl_7.16.4.bb"
#  from [9f422993011a8a54e5050ac333fe5e07a7112e3d]
#    to [e059af19afea35121903c9bfbda21700cbf38c07]
# 
# patch "packages/gcc/gcc-cross-sdk_3.4.4.bb"
#  from [ffaafb6a6ef931a5cd71c7623aba38189dc94161]
#    to [5f68404197e1e64b85ecc871a56c3b92bcf9f7aa]
# 
# patch "packages/gcc/gcc-cross_3.4.4.bb"
#  from [674605b2ebdca6409f1f687a9e7245c47464037d]
#    to [453cf98f7ad3555176dec060ff5490029d02f14b]
# 
# patch "packages/gcc/gcc_3.4.4.bb"
#  from [8218fda182662f3f4bcb0f5857619e901d8b6484]
#    to [cc912610fb5388443a043951f51dfe5831de626f]
# 
# patch "packages/linux/linux-linkstationarm_2.6.12.bb"
#  from [230d19e2e48f76e44f8caf816eef47910be90255]
#    to [5c531f3ff8db593954394d2cd7b0bbf6d5f3c034]
# 
# patch "packages/linux/linux-linkstationppc_2.6.21-rc5.bb"
#  from [d038fcab32af632acacf324702cc25ae2f298bb7]
#    to [679383825421e632b5d7cc7a4a1a719a3b8a403a]
# 
# patch "packages/linux/linux-rp-2.6.22/defconfig-qemux86"
#  from [13ba6932d390681dfa74465511435d21ed675514]
#    to [16b8d2c9fa793b6983ce17c0ad73916e3c892e8b]
# 
# patch "packages/linux/linux-rp_2.6.22.bb"
#  from [acbe4f75ccc973360308a4eb4bfc4071a439ddb4]
#    to [354129d3f7a203d9efebefa12179aacae093091c]
# 
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.18.bb"
#  from [62dcdcd2c929e0438841921e99fbfd336aa71d27]
#    to [1591ece17925b88a031d76f96246cad5d04d3424]
# 
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.20.bb"
#  from [d423e0a23731766a495f814c464864df869a77bd]
#    to [6ca5c4e670c6594210c1afa9d59511ab71dfe839]
# 
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.22.bb"
#  from [1793c1f183598c2d981b16023c4a14245807fc77]
#    to [66ed33603a1599bc68718e22c5e7fe1d81ff51cc]
# 
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.23.bb"
#  from [1793c1f183598c2d981b16023c4a14245807fc77]
#    to [66ed33603a1599bc68718e22c5e7fe1d81ff51cc]
# 
# patch "packages/ncurses/ncurses/visibility.patch"
#  from [847022687599a039689754695c85fae33fa139c5]
#    to [28c01d83f1ec0a069a217abdc954a822126275ac]
# 
# patch "packages/ncurses/ncurses_5.4.bb"
#  from [72e763fb5ea691972f152eeaf0b2df386fa086d8]
#    to [a2950eea2cdd28c32834e38f248e4bae8471d9c1]
# 
# patch "packages/tasks/task-base.bb"
#  from [7a9b59f5510daa79b732e48d67445e1d5ebc4c81]
#    to [3005c202e492ec2ec94e87ee07291c4f96060530]
# 
# patch "packages/uboot/u-boot-mkimage-openmoko-native_oe.bb"
#  from [c01c65b1498babb2fc3be4730cb705493ee6c823]
#    to [8f9f753bc2c5c49521344050b8d6c56e4ec93404]
# 
# patch "packages/uboot/u-boot-utils-native_1.2.0.bb"
#  from [a79cb700407a2e90e0c039014ac9e7ebb0f22219]
#    to [6a5c2e1750fa7ea68cbde9258d6e89c1aefb6528]
# 
# patch "packages/uboot/u-boot-utils_1.2.0.bb"
#  from [64396fa43c9fcef1ed1cd3ae82a49d140febbbd0]
#    to [a665ab3de0681644fca851349a5fd6339733fb46]
# 
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver"
#  from [82f390a2257420604caa01ac186221938ae505ce]
#    to [684d183b9b73eecbbdb15dc21ff863ae212a9e98]
# 
# patch "packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb"
#  from [b4455938ec659767eadfbe50dd3227b157c2076d]
#    to [6578acd7668e306b7372e0e3aebfb95d49fa7961]
# 
============================================================
--- packages/gcc/files/gcc4-mtune-compat.patch	7f1c7b590473405ac775e30f798822df399124bb
+++ packages/gcc/files/gcc4-mtune-compat.patch	7f1c7b590473405ac775e30f798822df399124bb
@@ -0,0 +1,14 @@
+Patch for gcc3 to support gcc4-compatible (and consistent) values for -mtune= option.
+
+--- gcc-3.4.4/gcc/config/arm/arm.c.org	2007-12-15 23:58:35.000000000 +0200
++++ gcc-3.4.4/gcc/config/arm/arm.c	2007-12-16 00:20:39.000000000 +0200
+@@ -432,7 +432,9 @@
+   {"arm10tdmi",	                         FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB | FL_LDSCHED             | FL_ARCH5 },
+   {"arm1020t",	                         FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB | FL_LDSCHED             | FL_ARCH5 },
+   {"arm926ejs",                          FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB                          | FL_ARCH5 | FL_ARCH5E },
++  {"arm926ej-s",                         FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB                          | FL_ARCH5 | FL_ARCH5E },
+   {"arm1026ejs",                         FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB                          | FL_ARCH5 | FL_ARCH5E },
++  {"arm1026ej-s",                        FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB                          | FL_ARCH5 | FL_ARCH5E },
+   {"xscale",                             FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB | FL_LDSCHED | FL_STRONG | FL_ARCH5 | FL_ARCH5E | FL_XSCALE },
+   {"iwmmxt",                             FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB | FL_LDSCHED | FL_STRONG | FL_ARCH5 | FL_ARCH5E | FL_XSCALE | FL_IWMMXT },
+   /* V6 Architecture Processors */
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc	2ee34e9004f488e328231f5a1f139e5225d0e2cf
+++ conf/distro/include/angstrom-2007-preferred-versions.inc	9bb6cf26f7a7451d99dda12e51b6584c26194aa5
@@ -1891,7 +1891,7 @@ PREFERRED_VERSION_ubahnnav ?= "0.4.1"
 PREFERRED_VERSION_u2nl ?= "1.3"
 PREFERRED_VERSION_uae4all ?= "0.7.1"
 PREFERRED_VERSION_ubahnnav ?= "0.4.1"
-PREFERRED_VERSION_u-boot-utils-native ?= "1.2.0"
+PREFERRED_VERSION_u-boot-utils ?= "1.2.0"
 PREFERRED_VERSION_udev ?= "092"
 PREFERRED_VERSION_udev-hostap-cs-vcc-workaround ?= "1.0"
 PREFERRED_VERSION_udhcp ?= "0.9.8"
============================================================
--- packages/curl/curl_7.16.4.bb	9f422993011a8a54e5050ac333fe5e07a7112e3d
+++ packages/curl/curl_7.16.4.bb	e059af19afea35121903c9bfbda21700cbf38c07
@@ -12,6 +12,7 @@ EXTRA_OECONF = "--with-zlib=${STAGING_LI
 EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
                 --with-gnutls=${STAGING_BINDIR_CROSS}/ \
                 --without-ssl \
+                --without-libssh2 \
 		--with-random=/dev/urandom \
 		--without-libidn \
 		--enable-crypto-auth \
============================================================
--- packages/gcc/gcc-cross-sdk_3.4.4.bb	ffaafb6a6ef931a5cd71c7623aba38189dc94161
+++ packages/gcc/gcc-cross-sdk_3.4.4.bb	5f68404197e1e64b85ecc871a56c3b92bcf9f7aa
@@ -1,9 +1,9 @@ require gcc_${PV}.bb
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
 require gcc_${PV}.bb
-PR = "r1"
+PR = "r2"
 
 inherit sdk
 
============================================================
--- packages/gcc/gcc-cross_3.4.4.bb	674605b2ebdca6409f1f687a9e7245c47464037d
+++ packages/gcc/gcc-cross_3.4.4.bb	453cf98f7ad3555176dec060ff5490029d02f14b
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r6"
+PR = "r7"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
============================================================
--- packages/gcc/gcc_3.4.4.bb	8218fda182662f3f4bcb0f5857619e901d8b6484
+++ packages/gcc/gcc_3.4.4.bb	cc912610fb5388443a043951f51dfe5831de626f
@@ -1,4 +1,4 @@
-PR = "r6"
+PR = "r7"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
@@ -23,7 +23,8 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/g
 	   file://15342.patch;patch=1 \
 	   file://always-fixincperm.patch;patch=1 \
 	   file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch;patch=1 \
-	   file://zecke-xgcc-cpp.patch;patch=1 "
+	   file://zecke-xgcc-cpp.patch;patch=1 \
+	   file://gcc4-mtune-compat.patch;patch=1"
 
 SRC_URI += "file://gcc34-configure.in.patch;patch=1"
 SRC_URI += "file://gcc34-thumb-support.patch;patch=1"
============================================================
--- packages/linux/linux-linkstationarm_2.6.12.bb	230d19e2e48f76e44f8caf816eef47910be90255
+++ packages/linux/linux-linkstationarm_2.6.12.bb	5c531f3ff8db593954394d2cd7b0bbf6d5f3c034
@@ -1,6 +1,7 @@ LICENSE = "GPL"
 DESCRIPTION = "Linux Kernel for ARM based Buffalo Linkstations"
 SECTION = "kernel"
 LICENSE = "GPL"
+DEPENDS += "u-boot-utils-native"
 PR = "r2"
 
 COMPATIBLE_MACHINE = "lsarm"
============================================================
--- packages/linux/linux-linkstationppc_2.6.21-rc5.bb	d038fcab32af632acacf324702cc25ae2f298bb7
+++ packages/linux/linux-linkstationppc_2.6.21-rc5.bb	679383825421e632b5d7cc7a4a1a719a3b8a403a
@@ -1,9 +1,9 @@ PR = "r0"
 DESCRIPTION = "Linux Kernel for the Buffalo Linkstation HG 2.6.21-rc5"
 SECTION = "kernel"
 LICENSE = "GPL"
 PR = "r0"
 
-DEPENDS = "dtc-native"
+DEPENDS = "dtc-native u-boot-utils-native"
 COMPATIBLE_MACHINE = "(lsppchd|lsppchg)"
 
 SRC_URI = "http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \
============================================================
--- packages/linux/linux-rp-2.6.22/defconfig-qemux86	13ba6932d390681dfa74465511435d21ed675514
+++ packages/linux/linux-rp-2.6.22/defconfig-qemux86	16b8d2c9fa793b6983ce17c0ad73916e3c892e8b
@@ -307,25 +307,107 @@ CONFIG_NETFILTER=y
 #
 # Core Netfilter Configuration
 #
-# CONFIG_NETFILTER_NETLINK is not set
-# CONFIG_NETFILTER_XTABLES is not set
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK_ENABLED=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CT_ACCT=y
+CONFIG_NF_CONNTRACK_MARK=y
+# CONFIG_NF_CONNTRACK_EVENTS is not set
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 #
 # IP: Netfilter Configuration
 #
-CONFIG_IP_NF_CONNTRACK=y
-# CONFIG_IP_NF_CT_ACCT is not set
-# CONFIG_IP_NF_CONNTRACK_MARK is not set
-# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
-# CONFIG_IP_NF_CT_PROTO_SCTP is not set
-# CONFIG_IP_NF_FTP is not set
-# CONFIG_IP_NF_IRC is not set
-# CONFIG_IP_NF_NETBIOS_NS is not set
-# CONFIG_IP_NF_TFTP is not set
-# CONFIG_IP_NF_AMANDA is not set
-# CONFIG_IP_NF_PPTP is not set
-# CONFIG_IP_NF_H323 is not set
-CONFIG_IP_NF_QUEUE=y
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_SAME=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
 
 #
 # DCCP Configuration (EXPERIMENTAL)
@@ -369,6 +451,15 @@ CONFIG_IP_NF_QUEUE=y
 # CONFIG_IEEE80211 is not set
 
 #
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+CONFIG_WIRELESS_EXT=y
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+
+#
 # Device Drivers
 #
 
@@ -1155,7 +1246,7 @@ CONFIG_SND_AC97_BUS=y
 # CONFIG_SND_CS5535AUDIO is not set
 # CONFIG_SND_EMU10K1 is not set
 # CONFIG_SND_EMU10K1X is not set
-# CONFIG_SND_ENS1370 is not set
+CONFIG_SND_ENS1370=y
 # CONFIG_SND_ENS1371 is not set
 # CONFIG_SND_ES1938 is not set
 # CONFIG_SND_ES1968 is not set
============================================================
--- packages/linux/linux-rp_2.6.22.bb	acbe4f75ccc973360308a4eb4bfc4071a439ddb4
+++ packages/linux/linux-rp_2.6.22.bb	354129d3f7a203d9efebefa12179aacae093091c
@@ -1,6 +1,6 @@ require linux-rp.inc
 require linux-rp.inc
 
-PR = "r11"
+PR = "r12"
 
 DEFAULT_PREFERENCE_poodle = "-99"
 
============================================================
--- packages/linux-libc-headers/linux-libc-headers_2.6.18.bb	62dcdcd2c929e0438841921e99fbfd336aa71d27
+++ packages/linux-libc-headers/linux-libc-headers_2.6.18.bb	1591ece17925b88a031d76f96246cad5d04d3424
@@ -1,8 +1,8 @@ DEPENDS += "unifdef-native"
 require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
            file://arm-syscall-define.patch;patch=1"
@@ -38,7 +38,7 @@ do_install() {
 
 do_install() {
 	set_arch
-	oe_runmake headers_install INSTALL_HDR_PATH=${D}/usr ARCH=${ARCH}
+	oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=${ARCH}
 }
 
 do_install_append_arm() {
@@ -51,7 +51,7 @@ do_stage () {
 	set_arch
 	rm -rf ${STAGE_TEMP}
 	mkdir -p ${STAGE_TEMP}
-	oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}/usr ARCH=${ARCH}
+	oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}${exec_prefix} ARCH=${ARCH}
 	if [ "${ARCH}" == "arm" ]; then
 		cp include/asm-arm/procinfo.h ${STAGE_TEMP}${includedir}/asm
 	fi
============================================================
--- packages/linux-libc-headers/linux-libc-headers_2.6.20.bb	d423e0a23731766a495f814c464864df869a77bd
+++ packages/linux-libc-headers/linux-libc-headers_2.6.20.bb	6ca5c4e670c6594210c1afa9d59511ab71dfe839
@@ -1,8 +1,8 @@ DEPENDS += "unifdef-native"
 require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://procinfo.h"
@@ -40,7 +40,7 @@ do_install() {
 
 do_install() {
 	set_arch
-	oe_runmake headers_install INSTALL_HDR_PATH=${D}/usr ARCH=$ARCH
+	oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
 }
 
 do_install_append_arm() {
@@ -54,7 +54,7 @@ do_stage () {
 	echo $ARCH
 	rm -rf ${STAGE_TEMP}
 	mkdir -p ${STAGE_TEMP}
-	oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}/usr ARCH=$ARCH
+	oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}${exec_prefix} ARCH=$ARCH
 	if [ "$ARCH" = "arm" ]; then
 		cp ${WORKDIR}/procinfo.h ${STAGE_TEMP}${includedi%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list