[oe-commits] org.oe.dev merge of '322ea19f98c9c37886c8eb080fbd9c6a552f7b1d'
oe commit
oe at amethyst.openembedded.net
Mon Apr 28 19:04:52 UTC 2008
merge of '322ea19f98c9c37886c8eb080fbd9c6a552f7b1d'
and 'bbaee78aa2be4934e6fb2377a1ef53589b7e3b7c'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: eb5dc762c98aed2a4c0e7f41d9b123cc774320b1
ViewMTN: http://monotone.openembedded.org/revision/info/eb5dc762c98aed2a4c0e7f41d9b123cc774320b1
Files:
1
conf/distro/include/preferred-om-2008-versions.inc
packages/gnash/gnash.inc
packages/gnash/gnash_0.8.1.bb
packages/gpsdrive/gpsdrive-2.10pre4
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop
packages/gpsdrive/gpsdrive_2.10pre4.bb
packages/hostap/hostap-daemon-0.6.3
packages/hostap/hostap-daemon-0.6.3/init
packages/hostap/hostap-daemon-0.6.3/makefile-cross.diff
packages/hostap/hostap-daemon_0.5.1.bb
packages/hostap/hostap-daemon_0.6.3.bb
packages/images/openmoko-qtopia-image.bb
packages/images/openmoko-qtopia-x11-image.bb
packages/multitap-pad
packages/multitap-pad/files
packages/multitap-pad/files/80multitappad
packages/multitap-pad/multitap-pad_svn.bb
packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb
packages/openmoko-tools/pty-forward-native.bb
packages/openmoko-tools/serial-forward.bb
packages/openmoko2/openmoko-dialer2/fic-gta01
packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch
packages/openmoko2/openmoko-dialer2/fic-gta02
packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch
packages/perl/libwww-perl-native_5.808.bb
packages/perl/libwww-perl_5.808.bb
packages/qtopia-phone
packages/qtopia-phone/files
packages/qtopia-phone/files/fic-gta01
packages/qtopia-phone/files/fic-gta01/device-conf
packages/qtopia-phone/files/fic-gta01/device-conf.old
packages/qtopia-phone/files/fic-gta01/qplatformdefs.h
packages/qtopia-phone/files/fic-gta02
packages/qtopia-phone/files/fic-gta02/device-conf
packages/qtopia-phone/files/fic-gta02/device-conf.old
packages/qtopia-phone/files/fic-gta02/qplatformdefs.h
packages/qtopia-phone/qtopia-phone-x11
packages/qtopia-phone/qtopia-phone-x11/fic-gta02
packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d
packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia
packages/qtopia-phone/qtopia-phone-x11/qtopia.sh
packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb
packages/qtopia-phone/qtopia-phone.inc
packages/qtopia-phone/qtopia-phone_4.3.0.bb
packages/qtopia-phone/qtopia-phone_4.3.1.bb
packages/qtopia-phone/qtopia-phone_arch.inc
packages/tasks/task-openmoko-qtopia-x11.bb
packages/tasks/task-openmoko-qtopia.bb
packages/hostap/hostap-daemon-0.5.10
packages/hostap/hostap-daemon-0.5.10/makefile-cross.diff
packages/hostap/hostap-daemon_0.5.10.bb
classes/sourcepkg.bbclass
conf/distro/include/sane-srcrevs.inc
packages/hostap/hostap-daemon/init
packages/linux/linux-omap2-git/beagleboard/add-beagle-sd-support.diff
packages/linux/linux-omap2-git/beagleboard/add-beagle-usb-support.diff
packages/linux/linux-omap2_git.bb
Diffs:
#
# mt diff -r322ea19f98c9c37886c8eb080fbd9c6a552f7b1d -reb5dc762c98aed2a4c0e7f41d9b123cc774320b1
#
#
#
# delete "conf/distro/include/preferred-om-2008-versions.inc"
#
# delete "packages/gnash/gnash.inc"
#
# delete "packages/gnash/gnash_0.8.1.bb"
#
# delete "packages/gpsdrive/gpsdrive-2.10pre4"
#
# delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch"
#
# delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch"
#
# delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch"
#
# delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop"
#
# delete "packages/gpsdrive/gpsdrive_2.10pre4.bb"
#
# delete "packages/hostap/hostap-daemon-0.6.3"
#
# delete "packages/hostap/hostap-daemon-0.6.3/init"
#
# delete "packages/hostap/hostap-daemon-0.6.3/makefile-cross.diff"
#
# delete "packages/hostap/hostap-daemon_0.5.1.bb"
#
# delete "packages/hostap/hostap-daemon_0.6.3.bb"
#
# delete "packages/images/openmoko-qtopia-image.bb"
#
# delete "packages/images/openmoko-qtopia-x11-image.bb"
#
# delete "packages/multitap-pad"
#
# delete "packages/multitap-pad/files"
#
# delete "packages/multitap-pad/files/80multitappad"
#
# delete "packages/multitap-pad/multitap-pad_svn.bb"
#
# delete "packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb"
#
# delete "packages/openmoko-tools/pty-forward-native.bb"
#
# delete "packages/openmoko-tools/serial-forward.bb"
#
# delete "packages/openmoko2/openmoko-dialer2/fic-gta01"
#
# delete "packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch"
#
# delete "packages/openmoko2/openmoko-dialer2/fic-gta02"
#
# delete "packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch"
#
# delete "packages/perl/libwww-perl-native_5.808.bb"
#
# delete "packages/perl/libwww-perl_5.808.bb"
#
# delete "packages/qtopia-phone"
#
# delete "packages/qtopia-phone/files"
#
# delete "packages/qtopia-phone/files/fic-gta01"
#
# delete "packages/qtopia-phone/files/fic-gta01/device-conf"
#
# delete "packages/qtopia-phone/files/fic-gta01/device-conf.old"
#
# delete "packages/qtopia-phone/files/fic-gta01/qplatformdefs.h"
#
# delete "packages/qtopia-phone/files/fic-gta02"
#
# delete "packages/qtopia-phone/files/fic-gta02/device-conf"
#
# delete "packages/qtopia-phone/files/fic-gta02/device-conf.old"
#
# delete "packages/qtopia-phone/files/fic-gta02/qplatformdefs.h"
#
# delete "packages/qtopia-phone/qtopia-phone-x11"
#
# delete "packages/qtopia-phone/qtopia-phone-x11/fic-gta02"
#
# delete "packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d"
#
# delete "packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia"
#
# delete "packages/qtopia-phone/qtopia-phone-x11/qtopia.sh"
#
# delete "packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb"
#
# delete "packages/qtopia-phone/qtopia-phone.inc"
#
# delete "packages/qtopia-phone/qtopia-phone_4.3.0.bb"
#
# delete "packages/qtopia-phone/qtopia-phone_4.3.1.bb"
#
# delete "packages/qtopia-phone/qtopia-phone_arch.inc"
#
# delete "packages/tasks/task-openmoko-qtopia-x11.bb"
#
# delete "packages/tasks/task-openmoko-qtopia.bb"
#
# add_dir "packages/hostap/hostap-daemon-0.5.10"
#
# add_file "packages/gnash/gnash.inc"
# content [66c805eb5cfd0e18a89770e022d4420ee9013566]
#
# add_file "packages/gnash/gnash_0.8.1.bb"
# content [50014de2c3904a6950c775be0eda4815399cb573]
#
# add_file "packages/hostap/hostap-daemon-0.5.10/makefile-cross.diff"
# content [e291454f9d39e1948a9b6487276aa4d641662bde]
#
# add_file "packages/hostap/hostap-daemon_0.5.10.bb"
# content [1ef529afd5463790fc19d5fa6b3768c4b672ced8]
#
# patch "classes/sourcepkg.bbclass"
# from [e4c6fac480eaea68ccd24d95a5878b9f5e41b464]
# to [4d9f8a49273051e27cb3e914d97f9ea3ebcdaba3]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [7314e35801b572c3e3928395538ae79453852b2f]
# to [af1d08078aa8f03db44e8b150bc4f043ad26b938]
#
# patch "packages/hostap/hostap-daemon/init"
# from [8d775a9f8d2ddf189341481afb130d386125700f]
# to [80bfdea40d350f7069665dbcaf302de3874d55b3]
#
============================================================
--- packages/gnash/gnash.inc 66c805eb5cfd0e18a89770e022d4420ee9013566
+++ packages/gnash/gnash.inc 66c805eb5cfd0e18a89770e022d4420ee9013566
@@ -0,0 +1,38 @@
+DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features"
+HOMEPAGE = "http://www.gnu.org/software/gnash"
+LICENSE = "GPL-2"
+DEPENDS = "gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl freetype"
+PR = "r1"
+
+SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2 \
+ "
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--enable-gui=gtk \
+ --enable-renderer=cairo \
+ --enable-media=none \
+ --disable-klash \
+ --enable-z \
+ --enable-jpeg \
+ --disable-glext \
+ --enable-Xft \
+ --enable-expat \
+ --enable-mad \
+ --enable-cairo \
+ --disable-plugin \
+ --disable-cygnal \
+ --with-top-level=${STAGING_DIR_HOST}/usr \
+ "
+
+PACKAGES =+ " libgnashamf libgnashbackend libgnashbase libgnashgeo libgnashgui libgnashplayer libgnashserver "
+
+FILES_libgnashamf = "${libdir}/libgnashamf-${PV}.so"
+FILES_libgnashbackend = "${libdir}/libgnashbackend-${PV}.so"
+FILES_libgnashbase = "${libdir}/libgnashbase-${PV}.so"
+FILES_libgnashgeo = "${libdir}/libgnashgeo-${PV}.so"
+FILES_libgnashgui = "${libdir}/libgnashgui-${PV}.so"
+FILES_libgnashplayer = "${libdir}/libgnashplayer-${PV}.so"
+FILES_libgnashserver = "${libdir}/libgnashserver-${PV}.so"
+
+PARALLEL_MAKE = ""
============================================================
--- packages/gnash/gnash_0.8.1.bb 50014de2c3904a6950c775be0eda4815399cb573
+++ packages/gnash/gnash_0.8.1.bb 50014de2c3904a6950c775be0eda4815399cb573
@@ -0,0 +1 @@
+require gnash.inc
============================================================
--- packages/hostap/hostap-daemon-0.5.10/makefile-cross.diff e291454f9d39e1948a9b6487276aa4d641662bde
+++ packages/hostap/hostap-daemon-0.5.10/makefile-cross.diff e291454f9d39e1948a9b6487276aa4d641662bde
@@ -0,0 +1,31 @@
+diff -urN hostapd-0.5.10.orig/Makefile hostapd-0.5.10/Makefile
+--- hostapd-0.5.10.orig/Makefile 2008-02-20 01:08:54.000000000 +0100
++++ hostapd-0.5.10/Makefile 2008-04-28 17:01:36.000000000 +0200
+@@ -1,10 +1,14 @@
++ifndef CC
+ CC=gcc
++endif
+ DIR_WPA_SUPPLICANT=.
+
+ ifndef CFLAGS
+ CFLAGS = -MMD -O2 -Wall -g
+ endif
+
++TARGET_PREFIX ?= /usr/local/bin/
++
+ # define HOSTAPD_DUMP_STATE to include SIGUSR1 handler for dumping state to
+ # a file (undefine it, if you want to save in binary size)
+ CFLAGS += -DHOSTAPD_DUMP_STATE
+@@ -333,10 +337,10 @@
+ fi
+
+ install: all
+- for i in $(ALL); do cp $$i /usr/local/bin/$$i; done
++ for i in $(ALL); do cp $$i $(TARGET_PREFIX)/$$i; done
+
+ hostapd: $(OBJS)
+- $(CC) -o hostapd $(OBJS) $(LIBS)
++ $(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
+
+ driver_conf.c: Makefile .config
+ rm -f driver_conf.c
============================================================
--- packages/hostap/hostap-daemon_0.5.10.bb 1ef529afd5463790fc19d5fa6b3768c4b672ced8
+++ packages/hostap/hostap-daemon_0.5.10.bb 1ef529afd5463790fc19d5fa6b3768c4b672ced8
@@ -0,0 +1,42 @@
+DESCRIPTION = "User space daemon for extended IEEE 802.11 management"
+HOMEPAGE = "http://hostap.epitest.fi"
+SECTION = "kernel/userland"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "openssl ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}"
+
+#we introduce MY_ARCH to get 'armv5te' as arch instead of the misleading 'arm' on armv5te builds
+MY_ARCH := "${PACKAGE_ARCH}"
+PACKAGE_ARCH = "${@base_contains('COMBINED_FEATURES', 'pci', '${MACHINE_ARCH}', '${MY_ARCH}', d)}"
+
+SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \
+ file://makefile-cross.diff;patch=1 \
+ file://defconfig \
+ file://init"
+
+S = "${WORKDIR}/hostapd-${PV}"
+
+export HAS_PCI = "${@base_contains('COMBINED_FEATURES', 'pci', 1, 0,d)}"
+
+inherit update-rc.d
+INITSCRIPT_NAME=hostapd
+
+do_configure() {
+ install -m 0644 ${WORKDIR}/defconfig ${S}/.config
+ if [ "x$HAS_PCI" == "x1" ] ; then
+ echo "CONFIG_DRIVER_MADWIFI=y" >> .config
+ echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config
+ fi
+}
+
+do_compile() {
+ make
+}
+
+do_install() {
+ install -d ${D}${sbindir} ${D}${sysconfdir}/init.d
+ make TARGET_PREFIX=${D}${sbindir} install
+ install -m 0644 hostapd.conf ${D}${sysconfdir}
+ install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd
+}
+
============================================================
--- classes/sourcepkg.bbclass e4c6fac480eaea68ccd24d95a5878b9f5e41b464
+++ classes/sourcepkg.bbclass 4d9f8a49273051e27cb3e914d97f9ea3ebcdaba3
@@ -18,20 +18,14 @@ def get_src_tree(d):
bb.error("S not defined, unable to find source tree.")
return
- try:
- s_tree_raw = s.split('/')[1]
- except IndexError:
- return
-
+ s_tree_raw = s.split('/')[1]
s_tree = bb.data.expand(s_tree_raw, d)
src_tree_path = os.path.join(workdir, s_tree)
try:
os.listdir(src_tree_path)
except OSError:
- bb.error("Expected to find source tree in '%s' which doesn't exist." % src_tree_path, s)
- return
-
+ bb.fatal("Expected to find source tree in '%s' which doesn't exist." % src_tree_path)
bb.debug("Assuming source tree is '%s'" % src_tree_path)
return s_tree
@@ -45,14 +39,11 @@ sourcepkg_do_create_orig_tgz(){
done
src_tree=${@get_src_tree(d)}
- if test x${src_tree} = x; then
- oenote "Skipping empty source tree"
- return
- fi
-
+
+ echo $src_tree
oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz"
tar cvzf ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz --exclude-from temp/exclude-from-file $src_tree
- cp -av $src_tree $src_tree.orig
+ cp -pPR $src_tree $src_tree.orig
}
sourcepkg_do_archive_bb() {
@@ -83,14 +74,7 @@ python sourcepkg_do_dumpdata() {
bb.note("Dumping metadata into '%s'" % dumpfile)
f = open(dumpfile, "w")
# emit variables and shell functions
-
- # FIXME: if we emit all, bitbake will get error while
- # evaluating AUTOREV since we have AUTOREV =
- # "${@bb.fetch.get_srcrev(d)}" in bitbake.conf, but get_srcrev
- # without a valid SRC_URI will cause problem.
-
- bb.data.emit_env(f, d, True)
-
+ bb.data.emit_env(f, d, True)
# emit the metadata which isnt valid shell
for e in d.keys():
if bb.data.getVarFlag(e, 'python', d):
@@ -105,11 +89,8 @@ sourcepkg_do_create_diff_gz(){
echo $i >> temp/exclude-from-file
done
+
src_tree=${@get_src_tree(d)}
- if test x${src_tree} = x; then
- oenote "Skipping empty source tree"
- return
- fi
for i in `find . -maxdepth 1 -type f`; do
mkdir -p $src_tree/${DISTRO}/files
@@ -121,10 +102,10 @@ sourcepkg_do_create_diff_gz(){
rm -rf $src_tree.orig
}
-#EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz
-EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_create_diff_gz
+EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz
addtask create_orig_tgz after do_unpack before do_patch
+addtask archive_bb after do_patch before do_dumpdata
+addtask dumpdata after do_archive_bb before do_create_diff_gz
+addtask create_diff_gz after do_dump_data before do_configure
+
-addtask archive_bb after do_patch before do_configure
-#addtask dumpdata after do_archive_bb before do_configure
-addtask create_diff_gz after do_archive_bb before do_configure
============================================================
--- conf/distro/include/sane-srcrevs.inc 7314e35801b572c3e3928395538ae79453852b2f
+++ conf/distro/include/sane-srcrevs.inc af1d08078aa8f03db44e8b150bc4f043ad26b938
@@ -152,7 +152,6 @@ SRCREV_pn-psplash ?= "249"
SRCREV_pn-oprofileui ?= "160"
SRCREV_pn-packagekit ?= "432046796fa420f57ab6c71081f7ba14e9a92574"
SRCREV_pn-psplash ?= "249"
-SRCREV_pn-pty-forward-native ?= "4214"
SRCREV_pn-py-odeviced ?= "190"
SRCREV_pn-pylgrim ?= "20"
SRCREV_pn-pyneod ?= "88"
@@ -163,10 +162,7 @@ SRCREV_pn-settings-daemon ?= "2006"
SRCREV_pn-python-pyrtc = "152"
SRCREV_pn-s3c24xx-gpio ?= "4130"
SRCREV_pn-settings-daemon ?= "2006"
-SRCREV_pn-serial-forward ?= "4214"
SRCREV_pn-sjf2410-linux-native ?= "4268"
-SRCREV_pn-settings-daemon ?= "1755"
-SRCREV_pn-sjf2410-linux-native ?= "933"
SRCREV_pn-sphyrna ?= "45"
SRCREV_pn-tmut ?= "60"
SRCREV_pn-u-boot-openmoko ?= "4297"
============================================================
--- packages/hostap/hostap-daemon/init 8d775a9f8d2ddf189341481afb130d386125700f
+++ packages/hostap/hostap-daemon/init 80bfdea40d350f7069665dbcaf302de3874d55b3
@@ -2,7 +2,7 @@ DESC="HOSTAP Daemon"
DAEMON=/usr/sbin/hostapd
NAME=hostapd
DESC="HOSTAP Daemon"
-ARGS="/etc/hostapd.conf"
+ARGS="/etc/hostapd.conf -B"
test -f $DAEMON || exit 0
@@ -10,25 +10,23 @@ case "$1" in
case "$1" in
start)
- echo -n "starting $DESC: $NAME... "
- start-stop-daemon -S -b -n $NAME -a $DAEMON -- $ARGS
- echo "done."
+ echo -n "Starting $DESC: "
+ start-stop-daemon -S -x $DAEMON -- $ARGS
+ echo "$NAME."
;;
stop)
- echo -n "stopping $DESC: $NAME... "
- start-stop-daemon -K -n $NAME
- echo "done."
+ echo -n "Stopping $DESC: "
+ start-stop-daemon -K -x $DAEMON
+ echo "$NAME."
;;
restart)
- echo "restarting $DESC: $NAME... "
- $0 stop
+ $0 stop
$0 start
- echo "done."
;;
reload)
- echo -n "reloading $DESC: $NAME... "
- killall -HUP $(basename ${DAEMON})
- echo "done."
+ echo -n "Reloading $DESC: "
+ killall -HUP $(basename ${DAEMON})
+ echo "$NAME."
;;
*)
echo "Usage: $0 {start|stop|restart|reload}"
#
# mt diff -rbbaee78aa2be4934e6fb2377a1ef53589b7e3b7c -reb5dc762c98aed2a4c0e7f41d9b123cc774320b1
#
#
#
# delete "packages/linux/linux-omap2-git/beagleboard/add-beagle-sd-support.diff"
#
# delete "packages/linux/linux-omap2-git/beagleboard/add-beagle-usb-support.diff"
#
# patch "packages/linux/linux-omap2_git.bb"
# from [572958866b1224d050811203fda9df19ee3f106a]
# to [e84865c7794f8227ce021537e22050f366fe51b3]
#
============================================================
--- packages/linux/linux-omap2_git.bb 572958866b1224d050811203fda9df19ee3f106a
+++ packages/linux/linux-omap2_git.bb e84865c7794f8227ce021537e22050f366fe51b3
@@ -2,7 +2,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}"
-SRCREV = "7f7e34f8fc2b6819f1a516f7955ef15d04eca716"
+SRCREV = "4bb9f8b58ed7d14d276750d1792cef9b3aa1e9ec"
PV = "2.6.25+git${SRCREV}"
PR = "r5"
@@ -12,7 +12,6 @@ SRC_URI_append_beagleboard = " file://no
file://defconfig"
SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \
- file://add-beagle-usb-support.diff;patch=1 \
"
COMPATIBLE_MACHINE = "omap2430sdp|omap2420h4|beagleboard"
More information about the Openembedded-commits
mailing list