<!-- 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/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]
#
============================================================
<font color="#FF6600">--- packages/gnash/gnash.inc        66c805eb5cfd0e18a89770e022d4420ee9013566</font>
<font color="#009900">+++ packages/gnash/gnash.inc        66c805eb5cfd0e18a89770e022d4420ee9013566</font>
<font color="#0000FF">@@ -0,0 +1,38 @@</font>
<font color="#009900">+DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features"</font>
<font color="#009900">+HOMEPAGE = "http://www.gnu.org/software/gnash"</font>
<font color="#009900">+LICENSE = "GPL-2"</font>
<font color="#009900">+DEPENDS = "gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl freetype"</font>
<font color="#009900">+PR = "r1"</font>
<font color="#009900">+</font>
<font color="#009900">+SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2 \</font>
<font color="#009900">+          "</font>
<font color="#009900">+</font>
<font color="#009900">+inherit autotools pkgconfig</font>
<font color="#009900">+</font>
<font color="#009900">+EXTRA_OECONF = "--enable-gui=gtk \</font>
<font color="#009900">+                --enable-renderer=cairo \</font>
<font color="#009900">+                --enable-media=none \</font>
<font color="#009900">+                --disable-klash \</font>
<font color="#009900">+                --enable-z \</font>
<font color="#009900">+                --enable-jpeg \</font>
<font color="#009900">+                --disable-glext \</font>
<font color="#009900">+                --enable-Xft \</font>
<font color="#009900">+                --enable-expat \</font>
<font color="#009900">+                --enable-mad \</font>
<font color="#009900">+                --enable-cairo \</font>
<font color="#009900">+                --disable-plugin \</font>
<font color="#009900">+                --disable-cygnal \</font>
<font color="#009900">+                --with-top-level=${STAGING_DIR_HOST}/usr \</font>
<font color="#009900">+                "</font>
<font color="#009900">+</font>
<font color="#009900">+PACKAGES =+ " libgnashamf libgnashbackend libgnashbase libgnashgeo libgnashgui libgnashplayer libgnashserver "</font>
<font color="#009900">+</font>
<font color="#009900">+FILES_libgnashamf = "${libdir}/libgnashamf-${PV}.so"</font>
<font color="#009900">+FILES_libgnashbackend = "${libdir}/libgnashbackend-${PV}.so"</font>
<font color="#009900">+FILES_libgnashbase = "${libdir}/libgnashbase-${PV}.so"</font>
<font color="#009900">+FILES_libgnashgeo = "${libdir}/libgnashgeo-${PV}.so"</font>
<font color="#009900">+FILES_libgnashgui = "${libdir}/libgnashgui-${PV}.so"</font>
<font color="#009900">+FILES_libgnashplayer = "${libdir}/libgnashplayer-${PV}.so"</font>
<font color="#009900">+FILES_libgnashserver = "${libdir}/libgnashserver-${PV}.so"</font>
<font color="#009900">+</font>
<font color="#009900">+PARALLEL_MAKE = ""</font>
============================================================
<font color="#FF6600">--- packages/gnash/gnash_0.8.1.bb        50014de2c3904a6950c775be0eda4815399cb573</font>
<font color="#009900">+++ packages/gnash/gnash_0.8.1.bb        50014de2c3904a6950c775be0eda4815399cb573</font>
<font color="#0000FF">@@ -0,0 +1 @@</font>
<font color="#009900">+require gnash.inc</font>
============================================================
<font color="#FF6600">--- packages/hostap/hostap-daemon-0.5.10/makefile-cross.diff        e291454f9d39e1948a9b6487276aa4d641662bde</font>
<font color="#009900">+++ packages/hostap/hostap-daemon-0.5.10/makefile-cross.diff        e291454f9d39e1948a9b6487276aa4d641662bde</font>
<font color="#0000FF">@@ -0,0 +1,31 @@</font>
<font color="#009900">+diff -urN hostapd-0.5.10.orig/Makefile hostapd-0.5.10/Makefile</font>
<font color="#009900">+--- hostapd-0.5.10.orig/Makefile        2008-02-20 01:08:54.000000000 +0100</font>
<font color="#009900">++++ hostapd-0.5.10/Makefile        2008-04-28 17:01:36.000000000 +0200</font>
<font color="#009900">+@@ -1,10 +1,14 @@</font>
<font color="#009900">++ifndef CC</font>
<font color="#009900">+ CC=gcc</font>
<font color="#009900">++endif</font>
<font color="#009900">+ DIR_WPA_SUPPLICANT=.</font>
<font color="#009900">+ </font>
<font color="#009900">+ ifndef CFLAGS</font>
<font color="#009900">+ CFLAGS = -MMD -O2 -Wall -g</font>
<font color="#009900">+ endif</font>
<font color="#009900">+ </font>
<font color="#009900">++TARGET_PREFIX ?= /usr/local/bin/</font>
<font color="#009900">++</font>
<font color="#009900">+ # define HOSTAPD_DUMP_STATE to include SIGUSR1 handler for dumping state to</font>
<font color="#009900">+ # a file (undefine it, if you want to save in binary size)</font>
<font color="#009900">+ CFLAGS += -DHOSTAPD_DUMP_STATE</font>
<font color="#009900">+@@ -333,10 +337,10 @@</font>
<font color="#009900">+         fi</font>
<font color="#009900">+ </font>
<font color="#009900">+ install: all</font>
<font color="#009900">+-        for i in $(ALL); do cp $$i /usr/local/bin/$$i; done</font>
<font color="#009900">++        for i in $(ALL); do cp $$i $(TARGET_PREFIX)/$$i; done</font>
<font color="#009900">+ </font>
<font color="#009900">+ hostapd: $(OBJS)</font>
<font color="#009900">+-        $(CC) -o hostapd $(OBJS) $(LIBS)</font>
<font color="#009900">++        $(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)</font>
<font color="#009900">+ </font>
<font color="#009900">+ driver_conf.c: Makefile .config</font>
<font color="#009900">+         rm -f driver_conf.c</font>
============================================================
<font color="#FF6600">--- packages/hostap/hostap-daemon_0.5.10.bb        1ef529afd5463790fc19d5fa6b3768c4b672ced8</font>
<font color="#009900">+++ packages/hostap/hostap-daemon_0.5.10.bb        1ef529afd5463790fc19d5fa6b3768c4b672ced8</font>
<font color="#0000FF">@@ -0,0 +1,42 @@</font>
<font color="#009900">+DESCRIPTION = "User space daemon for extended IEEE 802.11 management"</font>
<font color="#009900">+HOMEPAGE = "http://hostap.epitest.fi"</font>
<font color="#009900">+SECTION = "kernel/userland"</font>
<font color="#009900">+PRIORITY = "optional"</font>
<font color="#009900">+LICENSE = "GPL"</font>
<font color="#009900">+DEPENDS = "openssl ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}"</font>
<font color="#009900">+</font>
<font color="#009900">+#we introduce MY_ARCH to get 'armv5te' as arch instead of the misleading 'arm' on armv5te builds</font>
<font color="#009900">+MY_ARCH := "${PACKAGE_ARCH}"</font>
<font color="#009900">+PACKAGE_ARCH = "${@base_contains('COMBINED_FEATURES', 'pci', '${MACHINE_ARCH}', '${MY_ARCH}', d)}"</font>
<font color="#009900">+</font>
<font color="#009900">+SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \</font>
<font color="#009900">+        file://makefile-cross.diff;patch=1 \</font>
<font color="#009900">+        file://defconfig \</font>
<font color="#009900">+        file://init"</font>
<font color="#009900">+</font>
<font color="#009900">+S = "${WORKDIR}/hostapd-${PV}"</font>
<font color="#009900">+</font>
<font color="#009900">+export HAS_PCI = "${@base_contains('COMBINED_FEATURES', 'pci', 1, 0,d)}"</font>
<font color="#009900">+</font>
<font color="#009900">+inherit update-rc.d</font>
<font color="#009900">+INITSCRIPT_NAME=hostapd</font>
<font color="#009900">+</font>
<font color="#009900">+do_configure() {</font>
<font color="#009900">+        install -m 0644 ${WORKDIR}/defconfig ${S}/.config</font>
<font color="#009900">+        if [ "x$HAS_PCI" == "x1" ] ; then</font>
<font color="#009900">+                echo "CONFIG_DRIVER_MADWIFI=y" &gt;&gt; .config</font>
<font color="#009900">+                echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" &gt;&gt; .config</font>
<font color="#009900">+        fi</font>
<font color="#009900">+}</font>
<font color="#009900">+</font>
<font color="#009900">+do_compile() {</font>
<font color="#009900">+        make</font>
<font color="#009900">+}</font>
<font color="#009900">+</font>
<font color="#009900">+do_install() {</font>
<font color="#009900">+        install -d ${D}${sbindir} ${D}${sysconfdir}/init.d</font>
<font color="#009900">+        make TARGET_PREFIX=${D}${sbindir} install</font>
<font color="#009900">+        install -m 0644 hostapd.conf ${D}${sysconfdir}</font>
<font color="#009900">+        install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd</font>
<font color="#009900">+}</font>
<font color="#009900">+</font>
============================================================
<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 &gt;&gt; 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"
============================================================
<font color="#FF6600">--- packages/hostap/hostap-daemon/init        8d775a9f8d2ddf189341481afb130d386125700f</font>
<font color="#009900">+++ packages/hostap/hostap-daemon/init        80bfdea40d350f7069665dbcaf302de3874d55b3</font>
<font color="#0000FF">@@ -2,7 +2,7 @@ DESC="HOSTAP Daemon"</font>
 DAEMON=/usr/sbin/hostapd
 NAME=hostapd
 DESC="HOSTAP Daemon"
<font color="#FF6600">-ARGS="/etc/hostapd.conf"</font>
<font color="#009900">+ARGS="/etc/hostapd.conf -B"</font>
 
 test -f $DAEMON || exit 0
 
<font color="#0000FF">@@ -10,25 +10,23 @@ case "$1" in</font>
 
 case "$1" in
     start)
<font color="#FF6600">-        echo -n "starting $DESC: $NAME... "</font>
<font color="#FF6600">-        start-stop-daemon -S -b -n $NAME -a $DAEMON -- $ARGS</font>
<font color="#FF6600">-        echo "done."</font>
<font color="#009900">+        echo -n "Starting $DESC: "</font>
<font color="#009900">+        start-stop-daemon -S -x $DAEMON -- $ARGS</font>
<font color="#009900">+        echo "$NAME."</font>
         ;
     stop)
<font color="#FF6600">-        echo -n "stopping $DESC: $NAME... "</font>
<font color="#FF6600">-        start-stop-daemon -K -n $NAME</font>
<font color="#FF6600">-        echo "done."</font>
<font color="#009900">+        echo -n "Stopping $DESC: "</font>
<font color="#009900">+        start-stop-daemon -K -x $DAEMON</font>
<font color="#009900">+        echo "$NAME."</font>
         ;
     restart)
<font color="#FF6600">-        echo "restarting $DESC: $NAME... "</font>
<font color="#FF6600">-         $0 stop</font>
<font color="#009900">+        $0 stop</font>
         $0 start
<font color="#FF6600">-        echo "done."</font>
         ;
     reload)
<font color="#FF6600">-            echo -n "reloading $DESC: $NAME... "</font>
<font color="#FF6600">-            killall -HUP $(basename ${DAEMON})</font>
<font color="#FF6600">-        echo "done."</font>
<font color="#009900">+        echo -n "Reloading $DESC: "</font>
<font color="#009900">+        killall -HUP $(basename ${DAEMON})</font>
<font color="#009900">+        echo "$NAME."</font>
         ;
     *)
         echo "Usage: $0 {start|stop|restart|reload}"
</tt></pre>