[oe-commits] org.oe.dev merge of 'b25bbba02ddb4b23e57f722647bea8974b902b1e'
rwhitby commit
openembedded-commits at lists.openembedded.org
Sat Jul 7 18:03:15 UTC 2007
merge of 'b25bbba02ddb4b23e57f722647bea8974b902b1e'
and 'c2b7bf2b98443cd961a60ce5dd26e8d6e01afda2'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: c506dccde8011523567684ad6f95b95ffc334a5a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=c506dccde8011523567684ad6f95b95ffc334a5a
Files:
1
packages/linux/linux-rp-2.6.21/connectplus-prevent-oops-HACK.patch
packages/linux/linux-rp_2.6.21.bb
packages/opie-icon-reload/opie-icon-reload/icon-reload.sh
packages/opie-icon-reload/opie-icon-reload.inc
packages/opie-icon-reload/opie-icon-reload_1.2.2.bb
packages/opie-taskbar/opie-taskbar-images.inc
packages/opie-taskbar/opie-taskbar-images_cvs.bb
packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
packages/arm-kernel-shim/arm-kernel-shim_1.5.bb
packages/ixp4xx/ixp4xx-npe-native-2.3.2/IxNpeMicrocode.h
packages/ixp4xx/ixp4xx-npe-native_2.3.2.bb
packages/ixp4xx/ixp4xx-npe_2.3.2.bb
packages/linux/ixp4xx-kernel.inc
Diffs:
#
# mt diff -rb25bbba02ddb4b23e57f722647bea8974b902b1e -rc506dccde8011523567684ad6f95b95ffc334a5a
#
#
#
# add_file "packages/linux/linux-rp-2.6.21/connectplus-prevent-oops-HACK.patch"
# content [e7f07c5193600ba480642fd62dcae173b6b62189]
#
# patch "packages/linux/linux-rp_2.6.21.bb"
# from [cbbdd4376b6cb43e5460b02f28a25c2a29323db7]
# to [a4ef82513766940d2b728b8089a10118cda3dc9a]
#
# patch "packages/opie-icon-reload/opie-icon-reload/icon-reload.sh"
# from [a1248833761b9745e1b2788dd6ec15eaf2d48337]
# to [7cdcc4323c6c3af52a8bf59d27d1ba5c06990bf3]
#
# patch "packages/opie-icon-reload/opie-icon-reload.inc"
# from [3f5d81e3d57ca295eedaf901f2db0dddda8585bf]
# to [e2b00f75ac078c9ce5c4f1533a929578568a1682]
#
# patch "packages/opie-icon-reload/opie-icon-reload_1.2.2.bb"
# from [b3c3f0eee0c1e20e63f1f40d650b617e4e8ab934]
# to [b5121cb1d131c4e7469a666aa7f3d63c64856216]
#
# patch "packages/opie-taskbar/opie-taskbar-images.inc"
# from [d360a128f6873d3f280eb4f83502e056159dc8df]
# to [bcc14b15dcb6f610fb2fb93ea7a22680e5dc7c34]
#
# patch "packages/opie-taskbar/opie-taskbar-images_cvs.bb"
# from [f3d0e51204ca5fdab33a587c2c7f69acfa799f9e]
# to [364b475cbe870792af3b1c15affcecd9defe9c8e]
#
============================================================
--- packages/linux/linux-rp-2.6.21/connectplus-prevent-oops-HACK.patch e7f07c5193600ba480642fd62dcae173b6b62189
+++ packages/linux/linux-rp-2.6.21/connectplus-prevent-oops-HACK.patch e7f07c5193600ba480642fd62dcae173b6b62189
@@ -0,0 +1,17 @@
+Index: linux-2.6.21/drivers/net/wireless/hostap/hostap_hw.c
+===================================================================
+--- linux-2.6.21.orig/drivers/net/wireless/hostap/hostap_hw.c 2007-07-07 12:45:39.000000000 +0100
++++ linux-2.6.21/drivers/net/wireless/hostap/hostap_hw.c 2007-07-07 12:47:30.000000000 +0100
+@@ -2666,6 +2666,12 @@
+ iface = netdev_priv(dev);
+ local = iface->local;
+
++ if(dev->base_addr == 0)
++ {
++ printk(KERN_DEBUG "%s: IRQ before base_addr set\n", dev->name);
++ return IRQ_HANDLED;
++ }
++
+ prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INTERRUPT, 0, 0);
+
+ if (local->func->card_present && !local->func->card_present(local)) {
============================================================
--- packages/linux/linux-rp_2.6.21.bb cbbdd4376b6cb43e5460b02f28a25c2a29323db7
+++ packages/linux/linux-rp_2.6.21.bb a4ef82513766940d2b728b8089a10118cda3dc9a
@@ -1,6 +1,6 @@ require linux-rp.inc
require linux-rp.inc
-PR = "r8"
+PR = "r9"
# Handy URLs
# git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
@@ -49,6 +49,7 @@ SRC_URI = "http://www.kernel.org/pub/lin
${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack \
file://pxa-serial-hack.patch;patch=1;status=hack \
file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \
+ file://connectplus-prevent-oops-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 \
============================================================
--- packages/opie-icon-reload/opie-icon-reload/icon-reload.sh a1248833761b9745e1b2788dd6ec15eaf2d48337
+++ packages/opie-icon-reload/opie-icon-reload/icon-reload.sh 7cdcc4323c6c3af52a8bf59d27d1ba5c06990bf3
@@ -1,4 +1,4 @@
#!/bin/sh
+ at bindir@/qcop QPE/TaskBar "reloadInputMethods()"
+ at bindir@/qcop QPE/System "linkChanged(QString)"
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
-/opt/QtPalmtop/bin/qcop QPE/System "linkChanged(QString)"
============================================================
--- packages/opie-icon-reload/opie-icon-reload.inc 3f5d81e3d57ca295eedaf901f2db0dddda8585bf
+++ packages/opie-icon-reload/opie-icon-reload.inc e2b00f75ac078c9ce5c4f1533a929578568a1682
@@ -13,11 +13,12 @@ do_install() {
do_install() {
install -d ${D}${palmtopdir}/apps/Settings
- install -d ${D}${palmtopdir}/bin
+ install -d ${D}${bindir}
install -d ${D}${palmtopdir}/pics
install -m 0644 ${WORKDIR}/icon-reload.desktop ${D}${palmtopdir}/apps/Settings
- install -m 0755 ${WORKDIR}/icon-reload.sh ${D}${palmtopdir}/bin
+ install -m 0755 ${WORKDIR}/icon-reload.sh ${D}${bindir}
+ sed -i -e 's, at bindir@,${bindir},g' ${D}${bindir}/icon-reload.sh
install -m 0644 ${WORKDIR}/reload.png ${D}${palmtopdir}/pics
}
============================================================
--- packages/opie-icon-reload/opie-icon-reload_1.2.2.bb b3c3f0eee0c1e20e63f1f40d650b617e4e8ab934
+++ packages/opie-icon-reload/opie-icon-reload_1.2.2.bb b5121cb1d131c4e7469a666aa7f3d63c64856216
@@ -1,3 +1,3 @@ require ${PN}.inc
require ${PN}.inc
+PR = "r2"
-PR = "r1"
============================================================
--- packages/opie-taskbar/opie-taskbar-images.inc d360a128f6873d3f280eb4f83502e056159dc8df
+++ packages/opie-taskbar/opie-taskbar-images.inc bcc14b15dcb6f610fb2fb93ea7a22680e5dc7c34
@@ -28,19 +28,23 @@ do_install() {
install -m 0644 ${WORKDIR}/pics/launcher/firstuse.jpg ${D}${palmtopdir}/pics/launcher/firstuse-240x320.jpg
install -m 0644 ${WORKDIR}/pics/launcher/opie-background.jpg ${D}${palmtopdir}/pics/launcher/opie-background-240x320.jpg
- install -m 0644 ${WORKDIR}/pics/launcher/firstuse-480x640.jpg ${D}${palmtopdir}/pics/launcher/firstuse-480x640.jpg
- install -m 0644 ${WORKDIR}/pics/launcher/opie-background-480x640.jpg ${D}${palmtopdir}/pics/launcher/opie-background-480x640.jpg
+ for res in 480x640 640x480 800x600 ; do
+ install -m 0644 ${WORKDIR}/pics/launcher/firstuse-${res}.jpg ${D}${palmtopdir}/pics/launcher/firstuse-${res}.jpg
+ install -m 0644 ${WORKDIR}/pics/launcher/opie-background-${res}.jpg ${D}${palmtopdir}/pics/launcher/opie-background-${res}.jpg
+ done
+}
- install -m 0644 ${WORKDIR}/pics/launcher/firstuse-640x480.jpg ${D}${palmtopdir}/pics/launcher/firstuse-640x480.jpg
- install -m 0644 ${WORKDIR}/pics/launcher/opie-background-640x480.jpg ${D}${palmtopdir}/pics/launcher/opie-background-640x480.jpg
-
- install -m 0644 ${WORKDIR}/pics/launcher/firstuse-800x600.jpg ${D}${palmtopdir}/pics/launcher/firstuse-800x600.jpg
- install -m 0644 ${WORKDIR}/pics/launcher/opie-background-800x600.jpg ${D}${palmtopdir}/pics/launcher/opie-background-800x600.jpg
+python do_package_prepend () {
+ reslist = ['240x320','480x640','640x480', '800x600']
+ dir = bb.data.expand('${palmtopdir}/pics/launcher/', d)
+ ft = bb.data.expand('${palmtopdir}/pics/*/*-%s.*', d)
+ pn = bb.data.getVar('PN', d, 1)
+ for res in reslist:
+ bb.data.setVar('FILES_%s-%s' % (pn,res), ft % res, d )
+ postinst = ''
+ postinst = 'update-alternatives --install %sfirstuse.jpg opie-firstuse-pixmap %sfirstuse-%s.jpg 50\n' % (dir,dir,res)
+ postinst += 'update-alternatives --install %sopie-background.jpg opie-background-pixmap %sopie-background-%s.jpg 50\n' % (dir,dir,res)
+ bb.data.setVar('pkg_postinst_%s-%s' % (pn,res),postinst, d)
}
-FILES_${PN}-240x320 += " ${palmtopdir}/pics/*/*-240x320.*"
-FILES_${PN}-480x640 += " ${palmtopdir}/pics/*/*-480x640.*"
-FILES_${PN}-640x480 += " ${palmtopdir}/pics/*/*-640x480.*"
-FILES_${PN}-800x600 += " ${palmtopdir}/pics/*/*-800x600.*"
-
PACKAGE_ARCH = "all"
============================================================
--- packages/opie-taskbar/opie-taskbar-images_cvs.bb f3d0e51204ca5fdab33a587c2c7f69acfa799f9e
+++ packages/opie-taskbar/opie-taskbar-images_cvs.bb 364b475cbe870792af3b1c15affcecd9defe9c8e
@@ -1,5 +1,5 @@ PV = "${OPIE_CVS_PV}"
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
-PR = "r3"
+PR = "r4"
SRC_URI = "${HANDHELDS_CVS};module=opie/pics"
#
# mt diff -rc2b7bf2b98443cd961a60ce5dd26e8d6e01afda2 -rc506dccde8011523567684ad6f95b95ffc334a5a
#
#
#
# add_file "packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb"
# content [97a66b98a8afbc6569fe7455fd79084999b95d19]
#
# patch "packages/arm-kernel-shim/arm-kernel-shim_1.5.bb"
# from [691bb266bc3a89e594d2718bda178991edd6718a]
# to [1aa10be4fd793312e013b9a67176929f2d210191]
#
# patch "packages/ixp4xx/ixp4xx-npe-native-2.3.2/IxNpeMicrocode.h"
# from [15c8577df6dc6251306bcd9ff572530eaff73bfc]
# to [fed099dff45f8ede7c01a82414c61991b7fb3918]
#
# patch "packages/ixp4xx/ixp4xx-npe-native_2.3.2.bb"
# from [1a48057dbc3a9fcb7fa92f416961ed8baa393b5d]
# to [c9dde74cca70ebe27b0fb0d8d7129d675cd1fa7b]
#
# patch "packages/ixp4xx/ixp4xx-npe_2.3.2.bb"
# from [55465679e61e65694d073e2a9d8591a9a4c5ccf3]
# to [919cd093ac19788e178bc05921f065073ddff758]
#
# patch "packages/linux/ixp4xx-kernel.inc"
# from [997dbde0491b1140eedbc3c08003e0bacac082d5]
# to [5df5d3d8b85636bea02f6cffa26e60e0ef7a3395]
#
============================================================
--- packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb 97a66b98a8afbc6569fe7455fd79084999b95d19
+++ packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb 97a66b98a8afbc6569fe7455fd79084999b95d19
@@ -0,0 +1,25 @@
+# This kernel compiler is required by the Freecom FSG-3 machine
+# Please talk to Rod Whitby before considering removing this file.
+
+DEFAULT_PREFERENCE = "-1"
+
+SECTION = "devel"
+# cut-down gcc for kernel builds
+# only installs ${TARGET_PREFIX}gcc-${PV}, not ${TARGET_PREFIX}gcc.
+
+require gcc-cross-initial_${PV}.bb
+
+PROVIDES = "virtual/${TARGET_PREFIX}gcc-${PV}"
+
+SRC_URI += "file://gcc-3.4.4-makefile-fix.patch;patch=1"
+
+do_install () {
+ :
+}
+
+do_stage () {
+ cd gcc
+ oe_runmake install-common install-headers install-libgcc
+ install -m 0755 xgcc ${CROSS_DIR}/bin/${TARGET_PREFIX}gcc-${PV}
+}
+
============================================================
--- packages/arm-kernel-shim/arm-kernel-shim_1.5.bb 691bb266bc3a89e594d2718bda178991edd6718a
+++ packages/arm-kernel-shim/arm-kernel-shim_1.5.bb 1aa10be4fd793312e013b9a67176929f2d210191
@@ -5,7 +5,7 @@ PR = "r2"
LICENSE = "GPL"
PR = "r2"
-COMPATIBLE_MACHINE = "(ixp4xx|nslu2)"
+COMPATIBLE_MACHINE = "(ixp4xx|nslu2|fsg3)"
SRC_URI = "ftp://ftp.buici.com/pub/arm/arm-kernel-shim/arm-kernel-shim-${PV}.tar.gz \
file://config-nslu2.h \
============================================================
--- packages/ixp4xx/ixp4xx-npe-native-2.3.2/IxNpeMicrocode.h 15c8577df6dc6251306bcd9ff572530eaff73bfc
+++ packages/ixp4xx/ixp4xx-npe-native-2.3.2/IxNpeMicrocode.h fed099dff45f8ede7c01a82414c61991b7fb3918
@@ -51,11 +51,11 @@
// #define IX_NPEDL_NPEIMAGE_NPEC_DMA
// #define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_AES_ETH_LEARN_FILTER_SPAN
// #define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_AES_ETH_LEARN_FILTER_FIREWALL
-#define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_AES_CCM_ETH
+// #define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_AES_CCM_ETH
// #define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_ETH_LEARN_FILTER_SPAN_FIREWALL
// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_SPAN_FIREWALL_VLAN_QOS_HDR_CONV
// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_LEARN_FILTER_SPAN_FIREWALL_VLAN_QOS
-// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_LEARN_FILTER_SPAN_FIREWALL
+#define IX_NPEDL_NPEIMAGE_NPEC_ETH_LEARN_FILTER_SPAN_FIREWALL
#include <stdio.h>
============================================================
--- packages/ixp4xx/ixp4xx-npe-native_2.3.2.bb 1a48057dbc3a9fcb7fa92f416961ed8baa393b5d
+++ packages/ixp4xx/ixp4xx-npe-native_2.3.2.bb c9dde74cca70ebe27b0fb0d8d7129d675cd1fa7b
@@ -1,6 +1,6 @@ LICENSE = "Intel Public Licence"
DESCRIPTION = "Firmware converter for the IXP4xx line of devices"
LICENSE = "Intel Public Licence"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://You-Have-To-Download-The-Microcode-Manually-So-Please-Read-ixp4xx-npe_2.3.2.bb-For-Instructions/IPL_ixp400NpeLibrary-2_3_2.zip"
SRC_URI += "file://IxNpeMicrocode.h"
============================================================
--- packages/ixp4xx/ixp4xx-npe_2.3.2.bb 55465679e61e65694d073e2a9d8591a9a4c5ccf3
+++ packages/ixp4xx/ixp4xx-npe_2.3.2.bb 919cd093ac19788e178bc05921f065073ddff758
@@ -1,6 +1,6 @@ LICENSE = "Intel Public Licence"
DESCRIPTION = "NPE firmware for the IXP4xx line of devices"
LICENSE = "Intel Public Licence"
-PR = "r0"
+PR = "r1"
DEPENDS = "ixp4xx-npe-native"
# You need to download the IPL_ixp400NpeLibrary-2_3_2.zip file (without crypto) from:
@@ -13,7 +13,7 @@ COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
-FILES_${PN} = "${base_libdir}/firmware/NPE-B"
+FILES_${PN} = "${base_libdir}/firmware/NPE-B ${base_libdir}/firmware/NPE-C"
do_compile() {
${STAGING_BINDIR_NATIVE}/IxNpeMicrocode-${PV} -be
@@ -24,10 +24,14 @@ do_install() {
rm ${S}/NPE-B
mv ${S}/NPE-B.* ${S}/NPE-B
install ${S}/NPE-B ${D}/${base_libdir}/firmware/
+ rm ${S}/NPE-C
+ mv ${S}/NPE-C.* ${S}/NPE-C
+ install ${S}/NPE-C ${D}/${base_libdir}/firmware/
}
do_populate_staging() {
install -d ${STAGING_FIRMWARE_DIR}
install ${S}/NPE-B ${STAGING_FIRMWARE_DIR}/
+ install ${S}/NPE-C ${STAGING_FIRMWARE_DIR}/
}
============================================================
--- packages/linux/ixp4xx-kernel.inc 997dbde0491b1140eedbc3c08003e0bacac082d5
+++ packages/linux/ixp4xx-kernel.inc 5df5d3d8b85636bea02f6cffa26e60e0ef7a3395
@@ -151,7 +151,7 @@ COMPATIBLE_HOST = 'arm.*-linux.*'
SRC_URI += "${IXP4XX_PATCHES}"
COMPATIBLE_HOST = 'arm.*-linux.*'
-COMPATIBLE_MACHINE = '(ixp4xx|nslu2)'
+COMPATIBLE_MACHINE = '(ixp4xx|nslu2|fsg3)'
inherit kernel
More information about the Openembedded-commits
mailing list