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

[justinp commit]

merge of 'cfd14c49a0d924daeec754ef84c5b25d0b1a730f'
     and 'e995761e9cc807169de17a910a63e2c893092e10'

Author: justinp at openembedded.org
Branch: org.openembedded.dev
Revision: 443200d309a7cb2761ab1cda0036fdd1d2fc6714
ViewMTN: http://monotone.openembedded.org/revision.psp?id=443200d309a7cb2761ab1cda0036fdd1d2fc6714
Files:
1
packages/madwifi/madwifi-ng_r2518-20070626.bb
conf/distro/include/slugos.inc
packages/linux/linux-rp_2.6.21.bb
Diffs:

#
# mt diff -rcfd14c49a0d924daeec754ef84c5b25d0b1a730f -r443200d309a7cb2761ab1cda0036fdd1d2fc6714
#
# 
# 
# add_file "packages/madwifi/madwifi-ng_r2518-20070626.bb"
#  content [3a9994ed9252cf4eea51127470e69d0f8017024b]
# 
# patch "conf/distro/include/slugos.inc"
#  from [4105c50380f9423e8f6ed3e2a3621f5d19cec855]
#    to [d634625f9bd8ff8d6b2556f51f7ce153b2b45d15]
# 
============================================================
--- packages/madwifi/madwifi-ng_r2518-20070626.bb	3a9994ed9252cf4eea51127470e69d0f8017024b
+++ packages/madwifi/madwifi-ng_r2518-20070626.bb	3a9994ed9252cf4eea51127470e69d0f8017024b
@@ -0,0 +1,7 @@
+PR = "r0"
+
+# Disable stripping of kernel modules, since this action strips too
+# much out, and the resulting module won't load.
+INHIBIT_PACKAGE_STRIP = "1"
+
+require madwifi-ng_r.inc
============================================================
--- conf/distro/include/slugos.inc	4105c50380f9423e8f6ed3e2a3621f5d19cec855
+++ conf/distro/include/slugos.inc	d634625f9bd8ff8d6b2556f51f7ce153b2b45d15
@@ -142,6 +142,6 @@ IGNORE_STRIP_ERRORS = ""
 # Due to upstream instability, and another OE project with conflicting
 # needs, nail down a specific, known-working version of madwifi-ng.
 # Remove this once the madwifi-ng stuff seems to stabilize once again.
-PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225"
+#PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225"
 
 PREFERRED_VERSION_linux-libc-headers = "2.6.18"


#
# mt diff -re995761e9cc807169de17a910a63e2c893092e10 -r443200d309a7cb2761ab1cda0036fdd1d2fc6714
#
# 
# 
# patch "packages/linux/linux-rp_2.6.21.bb"
#  from [791613c9350e496eb591d9d3114c81a1e6b2c20c]
#    to [0611fe14d6ba36f9557f2f7c5814c1be6fbd7f84]
# 
============================================================
--- packages/linux/linux-rp_2.6.21.bb	791613c9350e496eb591d9d3114c81a1e6b2c20c
+++ packages/linux/linux-rp_2.6.21.bb	0611fe14d6ba36f9557f2f7c5814c1be6fbd7f84
@@ -1,6 +1,6 @@ require linux-rp.inc
 require linux-rp.inc
 
-PR = "r4"
+PR = "r5"
 
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
@@ -51,6 +51,7 @@ SRC_URI = "http://www.kernel.org/pub/lin
            file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \
            file://squashfs3.0-2.6.15.patch;patch=1;status=external \
            file://vesafb-tng-1.0-rc2-2.6.20-rc2.patch;patch=1;status=external \
+           file://sharpsl-rc-r1.patch;patch=1 \
            file://defconfig-c7x0 \
            file://defconfig-hx2000 \
            file://defconfig-collie \