[oe-commits] org.oe.dev many conf files: catch up with renaming linux_modules to linux-kernel-base

mickeyl commit openembedded-commits at lists.openembedded.org
Fri Oct 13 12:56:12 UTC 2006


many conf files: catch up with renaming linux_modules to linux-kernel-base
sorry, I didn't think of INHERIT +=

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 45a56df6cfb8cc83a1c1f9896a655ddb77db51bc
ViewMTN: http://monotone.openembedded.org/revision.psp?id=45a56df6cfb8cc83a1c1f9896a655ddb77db51bc
Files:
1
conf/distro/nylon.conf
conf/machine/h1940.conf
conf/machine/h3900.conf
conf/machine/include/handheld-common.conf
conf/machine/include/smartphone-common.conf
conf/machine/include/thinclient-common.conf
conf/machine/netbook-pro.conf
Diffs:

#
# mt diff -r43309b85ab66ca9bcb9fb8dbd0b8eab532632ef7 -r45a56df6cfb8cc83a1c1f9896a655ddb77db51bc
#
# 
# 
# patch "conf/distro/nylon.conf"
#  from [120dd06f2877ea1b56616efc5d4d0b50489f265c]
#    to [587feb9460378c39572f16ef78d17ee4233671f2]
# 
# patch "conf/machine/h1940.conf"
#  from [4222683932fa53c56e7f56abd3ecb0546e661605]
#    to [e57c9bf9dd70d8229e87035cbb1db327951dd3b6]
# 
# patch "conf/machine/h3900.conf"
#  from [8e55f250a9dd0bc80a96cb9beee5e5f85a2d11aa]
#    to [2fa9aff15013fabcd186e071e0623ee470b0c7f3]
# 
# patch "conf/machine/include/handheld-common.conf"
#  from [2aca1f0a7e2d4d0be5cf54fd3bbf8a096c255d36]
#    to [31219d5e052cf1888f5cd5272ab0ed0d334bb702]
# 
# patch "conf/machine/include/smartphone-common.conf"
#  from [7f49b31eeef8495ab618e48a3ba49b4e4ef608c6]
#    to [b08ed63784c5ad171111d7ce504f656591fb4d5d]
# 
# patch "conf/machine/include/thinclient-common.conf"
#  from [d1b94be520e7b27fa93cba434ab3e976a53ab38b]
#    to [03826f355345b38ae0f9c6f8bae861f138c6ce19]
# 
# patch "conf/machine/netbook-pro.conf"
#  from [73bf6993bdb2254f13c3eac680accdcc63c01fac]
#    to [ef3dc6ea33e4490dca9cf892120045685bd71dfb]
# 
============================================================
--- conf/distro/nylon.conf	120dd06f2877ea1b56616efc5d4d0b50489f265c
+++ conf/distro/nylon.conf	587feb9460378c39572f16ef78d17ee4233671f2
@@ -12,7 +12,7 @@ INHERIT += "package_ipk debian nylon-mir
 # Bruno Randolf <bruno.randolf at 4g-systems.biz>
 
 INHERIT += "package_ipk debian nylon-mirrors"
-INHERIT += "linux_modules"
+INHERIT += "linux-kernel-base"
 
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
============================================================
--- conf/machine/h1940.conf	4222683932fa53c56e7f56abd3ecb0546e661605
+++ conf/machine/h1940.conf	e57c9bf9dd70d8229e87035cbb1db327951dd3b6
@@ -14,7 +14,7 @@ BOOTSTRAP_EXTRA_RRECOMMENDS += "wireless
 BOOTSTRAP_EXTRA_RDEPENDS +=  "apm apmd network-suspend-scripts"
 BOOTSTRAP_EXTRA_RRECOMMENDS += "wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz scap ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
 
-INHERIT += "linux_modules"
+INHERIT += "linux-kernel-base"
 
 GUI_MACHINE_CLASS = "smallscreen"
 
============================================================
--- conf/machine/h3900.conf	8e55f250a9dd0bc80a96cb9beee5e5f85a2d11aa
+++ conf/machine/h3900.conf	2fa9aff15013fabcd186e071e0623ee470b0c7f3
@@ -5,7 +5,7 @@ KERNEL ?= "kernel24"
 KERNEL ?= "kernel24"
 #KERNEL ?= "kernel26"
 
-INHERIT += "linux_modules"
+INHERIT += "linux-kernel-base"
 
 OVERRIDES =. "${KERNEL}:"
 
============================================================
--- conf/machine/include/handheld-common.conf	2aca1f0a7e2d4d0be5cf54fd3bbf8a096c255d36
+++ conf/machine/include/handheld-common.conf	31219d5e052cf1888f5cd5272ab0ed0d334bb702
@@ -20,4 +20,4 @@ BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wire
 BOOTSTRAP_EXTRA_RDEPENDS +=  "${PCMCIA_MANAGER} apm apmd network-suspend-scripts"
 BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils  wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
 
+INHERIT += "linux-kernel-base"
-INHERIT += "linux_modules"
============================================================
--- conf/machine/include/smartphone-common.conf	7f49b31eeef8495ab618e48a3ba49b4e4ef608c6
+++ conf/machine/include/smartphone-common.conf	b08ed63784c5ad171111d7ce504f656591fb4d5d
@@ -18,4 +18,4 @@ BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wire
 BOOTSTRAP_EXTRA_RDEPENDS +=  "apm apmd network-suspend-scripts"
 BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
 
+INHERIT += "linux-kernel-base"
-INHERIT += "linux_modules"
============================================================
--- conf/machine/include/thinclient-common.conf	d1b94be520e7b27fa93cba434ab3e976a53ab38b
+++ conf/machine/include/thinclient-common.conf	03826f355345b38ae0f9c6f8bae861f138c6ce19
@@ -16,4 +16,4 @@ BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp blue
 BOOTSTRAP_EXTRA_RDEPENDS +=  "apm"
 BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp bluez-utils wireless-tools ${@linux_module_packages('${THINCLIENT_MODULES}', d)}"
 
+INHERIT += "linux-kernel-base"
-INHERIT += "linux_modules"
============================================================
--- conf/machine/netbook-pro.conf	73bf6993bdb2254f13c3eac680accdcc63c01fac
+++ conf/machine/netbook-pro.conf	ef3dc6ea33e4490dca9cf892120045685bd71dfb
@@ -1,8 +1,8 @@
 #@TYPE: Machine
 #@Name: Psion teklogix netbookpro Platform
 #@DESCRIPTION: Machine configuration for Psion teklogix netbookpro Platformm
 
-INHERIT += "linux_modules"
+INHERIT += "linux-kernel-base"
 
 TARGET_ARCH = "arm"
 IPKG_EXTRA_ARCHS = "armv5te"






More information about the Openembedded-commits mailing list