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

[mickeyl commit]

merge of 'e24780d148b92ff2ae1162d9886e4a7befaf60da'
     and 'eb765fb131a4212a65be90317c082f34cd4b4a41'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: e6dba568668063d79e9f4d1843c87e113ea51be3
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e6dba568668063d79e9f4d1843c87e113ea51be3
Files:
1
classes/efl_base.bbclass
packages/openmoko2/openmoko-terminal2/openmoko-terminal.png
packages/openmoko2/openmoko-terminal2_1.0.0.bb
packages/update-modules/update-modules_1.0.bb
Diffs:

#
# mt diff -re24780d148b92ff2ae1162d9886e4a7befaf60da -re6dba568668063d79e9f4d1843c87e113ea51be3
#
# 
# 
# patch "classes/efl_base.bbclass"
#  from [aabadd6f5cd07bd1ce37b7a34cf28f7031160028]
#    to [09892e0f0086d013b90a878b3d2b6d09064a44c8]
# 
# patch "packages/openmoko2/openmoko-terminal2/openmoko-terminal.png"
#  from [e7db9d314755face71a3ad7fd49d186333e1202f]
#    to [67eefa1549cc46741256e2e72bc30463809be1c2]
# 
# patch "packages/openmoko2/openmoko-terminal2_1.0.0.bb"
#  from [2ea84bd4f21c78174ab58bc7d9d93e18683612a1]
#    to [d58082b76e2897e348b38536dcf8f4e4d416212b]
# 
============================================================
--- classes/efl_base.bbclass	aabadd6f5cd07bd1ce37b7a34cf28f7031160028
+++ classes/efl_base.bbclass	09892e0f0086d013b90a878b3d2b6d09064a44c8
@@ -1,10 +1,5 @@ inherit autotools pkgconfig
 inherit autotools pkgconfig
 
-#do_prepsources () {
-#  make clean distclean || true
-#}
-#addtask prepsources after do_fetch before do_unpack
-
 SECTION = "e/libs"
 HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-native', '')}"
@@ -17,4 +12,3 @@ FILES_${PN}-dev += "${bindir}/${PN}-conf
 
 PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev"
 FILES_${PN}-dev += "${bindir}/${PN}-config ${libdir}/pkgconfig/* ${libdir}/lib*.?a ${libdir}/lib*.a"
-
============================================================
# packages/openmoko2/openmoko-terminal2/openmoko-terminal.png is binary
============================================================
--- packages/openmoko2/openmoko-terminal2_1.0.0.bb	2ea84bd4f21c78174ab58bc7d9d93e18683612a1
+++ packages/openmoko2/openmoko-terminal2_1.0.0.bb	d58082b76e2897e348b38536dcf8f4e4d416212b
@@ -1,10 +1,9 @@ RDEPENDS += "mrxvt"
 DESCRIPTION = "The OpenMoko Command Line Console"
 SECTION = "openmoko/applications"
 RDEPENDS += "mrxvt"
-PR = "r4"
-
 RCONFLICTS = "openmoko-terminal"
 RREPLACES = "openmoko-terminal"
+PR = "r5"
 
 inherit openmoko2
 


#
# mt diff -reb765fb131a4212a65be90317c082f34cd4b4a41 -re6dba568668063d79e9f4d1843c87e113ea51be3
#
# 
# 
# patch "packages/update-modules/update-modules_1.0.bb"
#  from [c826ebfc84c887b036affefdc32161fd9f4c103c]
#    to [7244af12c753fc05bb699d727f414e78975ec933]
# 
============================================================
--- packages/update-modules/update-modules_1.0.bb	c826ebfc84c887b036affefdc32161fd9f4c103c
+++ packages/update-modules/update-modules_1.0.bb	7244af12c753fc05bb699d727f414e78975ec933
@@ -1,9 +1,9 @@ RDEPENDS = "${@base_contains("MACHINE_FE
 SECTION = "base"
 DESCRIPTION = "Script to manage module configuration files"
 LICENSE = "GPLv2"
 PACKAGE_ARCH = "all"
 RDEPENDS = "${@base_contains("MACHINE_FEATURES", "kernel26",  "module-init-tools-depmod","modutils-depmod",d)} "
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "file://update-modules"
 
@@ -18,3 +18,13 @@ do_install() {
 	install -d ${D}${sbindir}
 	install ${WORKDIR}/update-modules ${D}${sbindir}
 }
+
+# The Unslung distro uses a 2.4 kernel for a machine (the NSLU2) which
+# supports both 2.4 and 2.6 kernels.  Rather than forcing OE to have
+# to deal with that unique legacy corner case, we just nullify the
+# RDEPENDS here and handle it in the Unslung image recipe. I know this
+# is ugly.  Please don't remove it unless you first make the RDEPENDS
+# line at the top of this file understand that a machine can be used
+# in both a 2.4 kernel distro and a 2.6 kernel distro.  Really, it's
+# not worth the effort to do that, so just overlook the next line.
+RDEPENDS_unslung = ""