<!-- Generator: GNU source-highlight 2.4
by Lorenzo Bettini
http://www.lorenzobettini.it
http://www.gnu.org/software/src-highlite -->
<pre><tt>#
#
# 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]
#
============================================================
<font color="#FF6600">--- classes/sourcepkg.bbclass e4c6fac480eaea68ccd24d95a5878b9f5e41b464</font>
<font color="#009900">+++ classes/sourcepkg.bbclass 4d9f8a49273051e27cb3e914d97f9ea3ebcdaba3</font>
<font color="#0000FF">@@ -18,20 +18,14 @@ def get_src_tree(d):</font>
bb.error("S not defined, unable to find source tree.")
return
<font color="#FF6600">- try:</font>
<font color="#FF6600">- s_tree_raw = s.split('/')[1]</font>
<font color="#FF6600">- except IndexError:</font>
<font color="#FF6600">- return</font>
<font color="#FF6600">-</font>
<font color="#009900">+ s_tree_raw = s.split('/')[1]</font>
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:
<font color="#FF6600">- bb.error("Expected to find source tree in '%s' which doesn't exist." % src_tree_path, s)</font>
<font color="#FF6600">- return</font>
<font color="#FF6600">-</font>
<font color="#009900">+ bb.fatal("Expected to find source tree in '%s' which doesn't exist." % src_tree_path)</font>
bb.debug("Assuming source tree is '%s'" % src_tree_path)
return s_tree
<font color="#0000FF">@@ -45,14 +39,11 @@ sourcepkg_do_create_orig_tgz(){</font>
done
src_tree=${@get_src_tree(d)}
<font color="#FF6600">- if test x${src_tree} = x; then</font>
<font color="#FF6600">- oenote "Skipping empty source tree"</font>
<font color="#FF6600">- return</font>
<font color="#FF6600">- fi</font>
<font color="#FF6600">-</font>
<font color="#009900">+ </font>
<font color="#009900">+ echo $src_tree</font>
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
<font color="#FF6600">- cp -av $src_tree $src_tree.orig</font>
<font color="#009900">+ cp -pPR $src_tree $src_tree.orig</font>
}
sourcepkg_do_archive_bb() {
<font color="#0000FF">@@ -83,14 +74,7 @@ python sourcepkg_do_dumpdata() {</font>
bb.note("Dumping metadata into '%s'" % dumpfile)
f = open(dumpfile, "w")
# emit variables and shell functions
<font color="#FF6600">-</font>
<font color="#FF6600">- # FIXME: if we emit all, bitbake will get error while</font>
<font color="#FF6600">- # evaluating AUTOREV since we have AUTOREV =</font>
<font color="#FF6600">- # "${@bb.fetch.get_srcrev(d)}" in bitbake.conf, but get_srcrev</font>
<font color="#FF6600">- # without a valid SRC_URI will cause problem.</font>
<font color="#FF6600">-</font>
<font color="#FF6600">- bb.data.emit_env(f, d, True)</font>
<font color="#FF6600">-</font>
<font color="#009900">+ bb.data.emit_env(f, d, True)</font>
# emit the metadata which isnt valid shell
for e in d.keys():
if bb.data.getVarFlag(e, 'python', d):
<font color="#0000FF">@@ -105,11 +89,8 @@ sourcepkg_do_create_diff_gz(){</font>
echo $i >> temp/exclude-from-file
done
<font color="#009900">+</font>
src_tree=${@get_src_tree(d)}
<font color="#FF6600">- if test x${src_tree} = x; then</font>
<font color="#FF6600">- oenote "Skipping empty source tree"</font>
<font color="#FF6600">- return</font>
<font color="#FF6600">- fi</font>
for i in `find . -maxdepth 1 -type f`; do
mkdir -p $src_tree/${DISTRO}/files
<font color="#0000FF">@@ -121,10 +102,10 @@ sourcepkg_do_create_diff_gz(){</font>
rm -rf $src_tree.orig
}
<font color="#FF6600">-#EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz</font>
<font color="#FF6600">-EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_create_diff_gz</font>
<font color="#009900">+EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz</font>
addtask create_orig_tgz after do_unpack before do_patch
<font color="#009900">+addtask archive_bb after do_patch before do_dumpdata</font>
<font color="#009900">+addtask dumpdata after do_archive_bb before do_create_diff_gz</font>
<font color="#009900">+addtask create_diff_gz after do_dump_data before do_configure</font>
<font color="#009900">+</font>
<font color="#FF6600">-addtask archive_bb after do_patch before do_configure</font>
<font color="#FF6600">-#addtask dumpdata after do_archive_bb before do_configure</font>
<font color="#FF6600">-addtask create_diff_gz after do_archive_bb before do_configure</font>
============================================================
<font color="#FF6600">--- conf/distro/include/sane-srcrevs.inc 7314e35801b572c3e3928395538ae79453852b2f</font>
<font color="#009900">+++ conf/distro/include/sane-srcrevs.inc af1d08078aa8f03db44e8b150bc4f043ad26b938</font>
<font color="#0000FF">@@ -152,7 +152,6 @@ SRCREV_pn-psplash ?= "249"</font>
SRCREV_pn-oprofileui ?= "160"
SRCREV_pn-packagekit ?= "432046796fa420f57ab6c71081f7ba14e9a92574"
SRCREV_pn-psplash ?= "249"
<font color="#FF6600">-SRCREV_pn-pty-forward-native ?= "4214"</font>
SRCREV_pn-py-odeviced ?= "190"
SRCREV_pn-pylgrim ?= "20"
SRCREV_pn-pyneod ?= "88"
<font color="#0000FF">@@ -163,10 +162,7 @@ SRCREV_pn-settings-daemon ?= "2006"</font>
SRCREV_pn-python-pyrtc = "152"
SRCREV_pn-s3c24xx-gpio ?= "4130"
SRCREV_pn-settings-daemon ?= "2006"
<font color="#FF6600">-SRCREV_pn-serial-forward ?= "4214"</font>
SRCREV_pn-sjf2410-linux-native ?= "4268"
<font color="#FF6600">-SRCREV_pn-settings-daemon ?= "1755"</font>
<font color="#FF6600">-SRCREV_pn-sjf2410-linux-native ?= "933"</font>
SRCREV_pn-sphyrna ?= "45"
SRCREV_pn-tmut ?= "60"
SRCREV_pn-u-boot-openmoko ?= "4297"
</tt></pre>