org.openembedded.dev: cae08a447604f8422be323a01560e7b04bc7c44b

oe at monotone.openmoko.org oe at monotone.openmoko.org
Fri May 2 21:05:25 CEST 2008


revision:            cae08a447604f8422be323a01560e7b04bc7c44b
date:                2008-04-28T14:50:46
author:              oe at openembedded.org
branch:              org.openembedded.dev
changelog:
merge of 'e0f576aebb5cfb2314d6b462c4903057ea1aceb3'
     and 'f0ec62cadbae3343a8a86690d39fcf38edf159d9'

manifest:
format_version "1"

new_manifest [bb334fdf3a09afa642d271ac85672b76711b8d99]

old_revision [e0f576aebb5cfb2314d6b462c4903057ea1aceb3]

delete "packages/hostap/hostap-daemon_0.3.7.bb"

delete "packages/hostap/hostap-modules_0.3.10.bb"

delete "packages/hostap/hostap-modules_0.3.7.bb"

delete "packages/hostap/hostap-modules_0.3.9.bb"

delete "packages/hostap/hostap-utils_0.3.7.bb"

patch "packages/madwifi/madwifi-ng_r.inc"
 from [7aa1e42dc113764feb73fa14b6553a8b16aac0c1]
   to [02bfd781ccdec369d0463597c718b93071e28e85]

old_revision [f0ec62cadbae3343a8a86690d39fcf38edf159d9]

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/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"

patch "classes/sourcepkg.bbclass"
 from [e4c6fac480eaea68ccd24d95a5878b9f5e41b464]
   to [4d9f8a49273051e27cb3e914d97f9ea3ebcdaba3]

patch "conf/distro/include/sane-srcrevs.inc"
 from [7314e35801b572c3e3928395538ae79453852b2f]
   to [af1d08078aa8f03db44e8b150bc4f043ad26b938]
-------------- next part --------------
#
#
# delete "packages/hostap/hostap-daemon_0.3.7.bb"
# 
# delete "packages/hostap/hostap-modules_0.3.10.bb"
# 
# delete "packages/hostap/hostap-modules_0.3.7.bb"
# 
# delete "packages/hostap/hostap-modules_0.3.9.bb"
# 
# delete "packages/hostap/hostap-utils_0.3.7.bb"
# 
# patch "packages/madwifi/madwifi-ng_r.inc"
#  from [7aa1e42dc113764feb73fa14b6553a8b16aac0c1]
#    to [02bfd781ccdec369d0463597c718b93071e28e85]
#
============================================================
--- packages/madwifi/madwifi-ng_r.inc	7aa1e42dc113764feb73fa14b6553a8b16aac0c1
+++ packages/madwifi/madwifi-ng_r.inc	02bfd781ccdec369d0463597c718b93071e28e85
@@ -10,7 +10,7 @@ WACKELF_SRC_URI_compulab-pxa270 = " file
 WACKELF_SRC_URI_ixp4xx = " file://20-xscale-VFP-wackelf.patch;patch=1"
 WACKELF_SRC_URI_compulab-pxa270 = " file://20-xscale-VFP-wackelf.patch;patch=1"
 
-SRC_URI = "http://snapshots.madwifi.org/${PN}/${PN}-${PV}.tar.gz \
+SRC_URI = "http://snapshots.madwifi.org/madwifi-trunk/${PN}-${PV}.tar.gz \
 	   file://10-xscale-be-elf-copts.patch;patch=1 \
 	   file://10-xscale-le-elf-copts.patch;patch=1 \
            file://10-sh4-le-elf-copts.patch;patch=1 \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080502/d012c523/attachment.htm 
-------------- next part --------------
#
#
# 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/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"
# 
# patch "classes/sourcepkg.bbclass"
#  from [e4c6fac480eaea68ccd24d95a5878b9f5e41b464]
#    to [4d9f8a49273051e27cb3e914d97f9ea3ebcdaba3]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [7314e35801b572c3e3928395538ae79453852b2f]
#    to [af1d08078aa8f03db44e8b150bc4f043ad26b938]
#
============================================================
--- 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"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080502/d012c523/attachment-0001.htm 


More information about the commitlog mailing list