[oe-commits] org.oe.dev merge of '5c05d65c9dd90a63a937c3b8da02ae5f8af28a21'

freyther commit openembedded-commits at lists.openembedded.org
Sun Jan 20 11:05:11 UTC 2008 

merge of '5c05d65c9dd90a63a937c3b8da02ae5f8af28a21'
     and 'd1820625c87154f827396b5afbc6cac762157b01'

Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: 215c8c2b3a21766792415cd13938319b23c91439
ViewMTN: http://monotone.openembedded.org/revision/info/215c8c2b3a21766792415cd13938319b23c91439
Files:
1
packages/rt2x00/rt73-k2wrlz_1.0.0.bb
packages/rt2x00/rt73-k2wrlz_2.0.1.bb
packages/tasks/task-openmoko-ui.bb
packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
packages/qt4/qt_packaging.inc
packages/qt4/qt_staging.inc
Diffs:

#
# mt diff -r5c05d65c9dd90a63a937c3b8da02ae5f8af28a21 -r215c8c2b3a21766792415cd13938319b23c91439
#
# 
# 
# patch "packages/rt2x00/rt73-k2wrlz_1.0.0.bb"
#  from [e5d2200434ee3d7d544b4b76220f2f981219e608]
#    to [6e3d56798d7cbb66593704a21b1b9ceebd6e1c8e]
# 
# patch "packages/rt2x00/rt73-k2wrlz_2.0.1.bb"
#  from [94c5ade405abb7ff66b4e2d6453b847385e0e177]
#    to [57b4bba40f82c56f55dcbf828353f7fa5cb5c68a]
# 
# patch "packages/tasks/task-openmoko-ui.bb"
#  from [bb6b9730c10ac671b39ef678698134fcbf9e7a05]
#    to [2ecbd1e8e6fb61f036cdc71551e7b835108d589c]
# 
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver"
#  from [684d183b9b73eecbbdb15dc21ff863ae212a9e98]
#    to [2915a14313602fff89685477aaabe69d4e32a457]
# 
# patch "packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb"
#  from [6578acd7668e306b7372e0e3aebfb95d49fa7961]
#    to [340d573b1a5fe3425baaf5aaff65d592981fb315]
# 
============================================================
--- packages/rt2x00/rt73-k2wrlz_1.0.0.bb	e5d2200434ee3d7d544b4b76220f2f981219e608
+++ packages/rt2x00/rt73-k2wrlz_1.0.0.bb	6e3d56798d7cbb66593704a21b1b9ceebd6e1c8e
@@ -1,17 +1,15 @@ LICENSE = "GPL"
 DESCRIPTION = "Enhanced Driver for Ralink rt73 USB 802.11g WiFi sticks"
 HOMEPAGE = "http://homepages.tu-darmstadt.de/~p_larbig/wlan"
 SECTION = "kernel/modules"
 LICENSE = "GPL"
- 
+PR = "r1"
+
 SRC_URI= "http://homepages.tu-darmstadt.de/~p_larbig/wlan/rt73-k2wrlz-1.0.0.tar.bz2"
 inherit module
  
 S = "${WORKDIR}/${PN}-${PV}/Module/"
  
-do_compile() { 
-  export KERNDIR=${STAGING_KERNEL_DIR} 
-  module_do_compile
-}
+EXTRA_OEMAKE = "KERNDIR=${STAGING_KERNEL_DIR}"
  
 do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra
============================================================
--- packages/rt2x00/rt73-k2wrlz_2.0.1.bb	94c5ade405abb7ff66b4e2d6453b847385e0e177
+++ packages/rt2x00/rt73-k2wrlz_2.0.1.bb	57b4bba40f82c56f55dcbf828353f7fa5cb5c68a
@@ -1,18 +1,16 @@ LICENSE = "GPL"
 DESCRIPTION = "Enhanced Driver for Ralink rt73 USB 802.11g WiFi sticks"
 HOMEPAGE = "http://homepages.tu-darmstadt.de/~p_larbig/wlan"
 SECTION = "kernel/modules"
 LICENSE = "GPL"
- 
+PR = "r1" 
+
 SRC_URI="http://homepages.tu-darmstadt.de/~p_larbig/wlan/${PN}-${PV}.tar.bz2"
 
 inherit module
  
 S = "${WORKDIR}/${PN}-${PV}/Module/"
  
-do_compile() { 
-  export KERNDIR=${STAGING_KERNEL_DIR} 
-  module_do_compile
-}
+EXTRA_OEMAKE = "KERNDIR=${STAGING_KERNEL_DIR}"
  
 do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra
============================================================
--- packages/tasks/task-openmoko-ui.bb	bb6b9730c10ac671b39ef678698134fcbf9e7a05
+++ packages/tasks/task-openmoko-ui.bb	2ecbd1e8e6fb61f036cdc71551e7b835108d589c
@@ -1,7 +1,7 @@ LICENSE = "MIT"
 DESCRIPTION = "OpenMoko: GUI for the OpenMoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r71"
+PR = "r72"
 
 inherit task
 
@@ -52,5 +52,6 @@ THEMES_magician = "openmoko-icon-theme-s
 THEMES_rokre2   = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
 THEMES_rokre6   = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
 THEMES_magician = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
+THEMES_chumby   = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
 
 RDEPENDS_task-openmoko-ui += "${THEMES}"
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver	684d183b9b73eecbbdb15dc21ff863ae212a9e98
+++ packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver	2915a14313602fff89685477aaabe69d4e32a457
@@ -99,6 +99,9 @@ case `module_id` in
                 ARGS="$ARGS -dpi 170 -screen 240x320 -hide-cursor -root-ppm /usr/share/pixmaps/xsplash-qvga.ppm" ;;
         "Nokia N800")
                 ARGS="$ARGS -br -dpi 225 -screen 800x480x16 -mouse tslib" ;;
+	"Freescale MX21ADS")
+		# That's what /proc/cpuinfo shows as hardware on the chumby
+		ARGS="$ARGS -dpi 121 -screen 320x240 -hide-cursor -mouse tslib -root-ppm /usr/share/pixmaps/xsplash-qvga.ppm" ;;
         *)
                 # It is a device we do not know about, in which case we force
                 # kdrive to use the current framebuffer geometry -- otherwise
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb	6578acd7668e306b7372e0e3aebfb95d49fa7961
+++ packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb	340d573b1a5fe3425baaf5aaff65d592981fb315
@@ -1,8 +1,8 @@ RDEPENDS_${PN} = "xmodmap libxrandr xdpy
 DESCRIPTION = "Common X11 scripts"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit"
-PR = "r25"
+PR = "r26"
 
 SRC_URI = "\
   file://Xdefaults \


#
# mt diff -rd1820625c87154f827396b5afbc6cac762157b01 -r215c8c2b3a21766792415cd13938319b23c91439
#
# 
# 
# patch "packages/qt4/qt_packaging.inc"
#  from [49645ec215cac92b25eb2867013540ce7d7bd328]
#    to [b7908307df304cf7663fbeed5aa0765694bc334f]
# 
# patch "packages/qt4/qt_staging.inc"
#  from [7cfc32182e50d232e37d0c6ff7a596d8ec467cc7]
#    to [299c95fa7b3b469f300d50bb8dfe49412a6ec9bf]
# 
============================================================
--- packages/qt4/qt_packaging.inc	49645ec215cac92b25eb2867013540ce7d7bd328
+++ packages/qt4/qt_packaging.inc	b7908307df304cf7663fbeed5aa0765694bc334f
@@ -1,4 +1,4 @@
-NONDEV_PACKAGES = "${QT_BASE_LIB}core4 ${QT_BASE_LIB}gui4 ${QT_BASE_LIB}network4  \
+NONDEV_PACKAGES += "${QT_BASE_LIB}core4 ${QT_BASE_LIB}gui4 ${QT_BASE_LIB}network4  \
              ${QT_BASE_LIB}sql4 ${QT_BASE_LIB}svg4 ${QT_BASE_LIB}test4 ${QT_BASE_LIB}xml4 \
              ${QT_BASE_LIB}designer4 ${QT_BASE_LIB}designercomponents4 \
              ${QT_BASE_LIB}3support4 ${QT_BASE_LIB}assistantclient4 ${QT_BASE_LIB}script4 \
============================================================
--- packages/qt4/qt_staging.inc	7cfc32182e50d232e37d0c6ff7a596d8ec467cc7
+++ packages/qt4/qt_staging.inc	299c95fa7b3b469f300d50bb8dfe49412a6ec9bf
@@ -1,9 +1,13 @@ do_stage_append() {
 # Fixing up some Qt .pc files
 do_stage_append() {
     cd ${STAGING_LIBDIR}/pkgconfig
     sed -i s#"-L${S}/lib"##g Qt*.pc
     sed -i s#"moc_location=${S}/bin/moc"#moc_location=${STAGING_BINDIR}/moc4# Qt*.pc
     sed -i s#"uic_location=${S}/bin/uic"#uic_location=${STAGING_BINDIR}/uic4# Qt*.pc
+    sed -i s#libdir=\$\{prefix\}/lib#libdir=\$\{prefix\}/lib/${QT_DIR_NAME}#g Qt*.pc 
+
+    cd ${STAGING_LIBDIR}/${QT_DIR_NAME}
+    sed -i s#"-L${S}/lib"##g libQt*.la
 }
 
 STAGE_TEMP = "${WORKDIR}/temp-staging"

More information about the Openembedded-commits mailing list