<!-- Generator: GNU source-highlight 2.4
by Lorenzo Bettini
http://www.lorenzobettini.it
http://www.gnu.org/software/src-highlite -->
<pre><tt>#
#
# delete "packages/wpa-supplicant/wpa-supplicant"
#
# delete "packages/wpa-supplicant/wpa-supplicant/gnutlsfix.patch"
#
# delete "packages/wpa-supplicant/wpa-supplicant-0.5.inc"
#
# delete "packages/wpa-supplicant/wpa-supplicant-nossl"
#
# delete "packages/wpa-supplicant/wpa-supplicant-nossl/wpa-defconfig"
#
# delete "packages/wpa-supplicant/wpa-supplicant-nossl_0.2.6.bb"
#
# delete "packages/wpa-supplicant/wpa-supplicant-ssl"
#
# delete "packages/wpa-supplicant/wpa-supplicant-ssl/wpa-defconfig"
#
# delete "packages/wpa-supplicant/wpa-supplicant-ssl_0.2.6.bb"
#
# delete "packages/wpa-supplicant/wpa-supplicant_0.2.6.inc"
#
# delete "packages/wpa-supplicant/wpa-supplicant_0.3.6.bb"
#
# delete "packages/wpa-supplicant/wpa-supplicant_0.3.8.bb"
#
# delete "packages/wpa-supplicant/wpa-supplicant_0.5.5.bb"
#
# delete "packages/wpa-supplicant/wpa-supplicant_0.5.7.bb"
#
# delete "packages/wpa-supplicant/wpa-supplicant_cvs.bb"
#
# add_file "conf/machine/htckaiser.conf"
# content [8ecec3cc2692888e23f7f4ac09f4cb55c7234e4b]
#
# add_file "packages/linux/linux-kaiser_2.6.24+git.bb"
# content [f35b44d6d3ebfde341c328a3b1e8362f8dec89de]
#
# add_file "packages/wpa-supplicant/wpa-supplicant_0.5.10.bb"
# content [96f91121be0d1a9fb9a7bbe2872fa7da5b580c83]
#
# patch "classes/kernel.bbclass"
# from [0e7bc22f0cbc8ab0efe1c7ffb69e9171f99a8b21]
# to [8d92c5a7b6420490dd6b3115e8146b3fc0a0f854]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [521cedb389bc68d1f7ab5ea2240153394d425295]
# to [af1d08078aa8f03db44e8b150bc4f043ad26b938]
#
# patch "conf/machine/at32stk1000.conf"
# from [3d5142529536576aea6056c6d761540974caa5ac]
# to [163fd78fdfe07eb3befe4b759102820ed434730b]
#
# patch "conf/machine/om-gta02.conf"
# from [bb34d745d24d709bd9a6fe113c95e816ba6c788a]
# to [8a81b5b7224a98d62de1611265a26386dc77b5f2]
#
# patch "contrib/mtn2git/update-script.example"
# from [9f8caa85b400e9a7af49d8714a42648ffc346027]
# to [d6ef8840e9ca1f2ae57480d782ecc1eddc7430a1]
#
# patch "packages/gnuradio/gnuradio.inc"
# from [f3784a8b6e3c9fcbccabd3014638b35285a1adba]
# to [2b1aa21c076bc1d46a68628c02898068873279c0]
#
# patch "packages/gnuradio/gnuradio_3.0.4.bb"
# from [e935ec6d343e8fdb415db8992f198c118b3780af]
# to [9f16e9d9d4673c6cb75c8bb01e3dfea2cb2da338]
#
# patch "packages/gnuradio/gnuradio_3.1.2.bb"
# from [e935ec6d343e8fdb415db8992f198c118b3780af]
# to [9f16e9d9d4673c6cb75c8bb01e3dfea2cb2da338]
#
# patch "packages/gnuradio/gnuradio_svn.bb"
# from [c208d7c99e0267f8380bd0efe7d3d2bffdfb6247]
# to [351ac3dd01f04c457e29330a4098d8cf3271cb1e]
#
# patch "packages/images/unslung-image.bb"
# from [e4cf81045fb8a8e211e464905d1b307c49987663]
# to [738ce981801bef8a0c76499a9524887eeb1547ff]
#
# patch "packages/meta/slugos-packages.bb"
# from [a8de050f9b9bde46ec2fe91cdf9d93c69da445cb]
# to [46c8ac8a7503c5e222ee23a677a92db2e2ea9dcb]
#
# patch "packages/openocd/openocd_svn.bb"
# from [ff4b08ed923a74c3efa4730980288907a11baeb7]
# to [5863de22800841c9bcd0fe5b4014ef3d911f91a2]
#
# patch "packages/rsync/rsync.inc"
# from [7c3e306cf41e043732b6fedbc8c41ebc491fedaf]
# to [1d1f2cbe00f4779bdc3dc7f9689611d817e90259]
#
# patch "packages/rsync/rsync_2.6.9.bb"
# from [46d56c1ae65397da35a2b8871cfecde62e0a382e]
# to [1b1f42efd8d5dc944a9638cd0678259c995c08dd]
#
# patch "packages/rsync/rsync_3.0.0.bb"
# from [265d3e5b7ec96ad6b092880621ccd67844dd9dc7]
# to [dd9114bcedbdbe8b612946916a35fe4a662cd34c]
#
============================================================
<font color="#FF6600">--- conf/machine/htckaiser.conf 8ecec3cc2692888e23f7f4ac09f4cb55c7234e4b</font>
<font color="#009900">+++ conf/machine/htckaiser.conf 8ecec3cc2692888e23f7f4ac09f4cb55c7234e4b</font>
<font color="#0000FF">@@ -0,0 +1,25 @@</font>
<font color="#009900">+#@TYPE: Machine</font>
<font color="#009900">+#@NAME: HTC Kaiser phone</font>
<font color="#009900">+#@DESCRIPTION: Machine configuration for HTC Kaiser phone</font>
<font color="#009900">+TARGET_ARCH = "arm"</font>
<font color="#009900">+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6"</font>
<font color="#009900">+ </font>
<font color="#009900">+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"</font>
<font color="#009900">+XSERVER = "xserver-kdrive-fbdev"</font>
<font color="#009900">+ </font>
<font color="#009900">+GUI_MACHINE_CLASS = "smallscreen"</font>
<font color="#009900">+MACHINE_DISPLAY_WIDTH_PIXELS = "240"</font>
<font color="#009900">+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"</font>
<font color="#009900">+ </font>
<font color="#009900">+TARGET_FPU = "soft"</font>
<font color="#009900">+TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s"</font>
<font color="#009900">+FEED_ARCH = "armv6"</font>
<font color="#009900">+PACKAGE_ARCH = "armv6"</font>
<font color="#009900">+ </font>
<font color="#009900">+</font>
<font color="#009900">+IMAGE_FSTYPES ?= "tar.gz cpio.gz"</font>
<font color="#009900">+ </font>
<font color="#009900">+PREFERRED_PROVIDER_virtual/kernel = "linux-kaiser"</font>
<font color="#009900">+ </font>
<font color="#009900">+MACHINE_FEATURES = "kernel26 touchscreen screen keyboard"</font>
<font color="#009900">+</font>
============================================================
<font color="#FF6600">--- packages/linux/linux-kaiser_2.6.24+git.bb f35b44d6d3ebfde341c328a3b1e8362f8dec89de</font>
<font color="#009900">+++ packages/linux/linux-kaiser_2.6.24+git.bb f35b44d6d3ebfde341c328a3b1e8362f8dec89de</font>
<font color="#0000FF">@@ -0,0 +1,15 @@</font>
<font color="#009900">+require linux.inc</font>
<font color="#009900">+</font>
<font color="#009900">+PV = "2.6.24+git${SRCREV}"</font>
<font color="#009900">+</font>
<font color="#009900">+COMPATIBLE_MACHINE = "htckaiser"</font>
<font color="#009900">+</font>
<font color="#009900">+SRC_URI = "git://git.android.com/kernel.git;branch=android-msm;protocol=git \</font>
<font color="#009900">+ http://baliniak.pl/android/kernel.diff;patch=1"</font>
<font color="#009900">+</font>
<font color="#009900">+S = "${WORKDIR}/git"</font>
<font color="#009900">+</font>
<font color="#009900">+do_configure_prepend() {</font>
<font color="#009900">+ cp .config ../defconfig</font>
<font color="#009900">+}</font>
<font color="#009900">+</font>
============================================================
<font color="#FF6600">--- packages/wpa-supplicant/wpa-supplicant_0.5.10.bb 96f91121be0d1a9fb9a7bbe2872fa7da5b580c83</font>
<font color="#009900">+++ packages/wpa-supplicant/wpa-supplicant_0.5.10.bb 96f91121be0d1a9fb9a7bbe2872fa7da5b580c83</font>
<font color="#0000FF">@@ -0,0 +1,61 @@</font>
<font color="#009900">+DESCRIPTION = "A Client for Wi-Fi Protected Access (WPA)."</font>
<font color="#009900">+SECTION = "network"</font>
<font color="#009900">+LICENSE = "GPL"</font>
<font color="#009900">+HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"</font>
<font color="#009900">+DEPENDS = "gnutls ${@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/wpa_supplicant-${PV}.tar.gz \</font>
<font color="#009900">+ file://defconfig-gnutls \</font>
<font color="#009900">+ file://ifupdown.sh \</font>
<font color="#009900">+ file://functions.sh"</font>
<font color="#009900">+</font>
<font color="#009900">+S = "${WORKDIR}/wpa_supplicant-${PV}"</font>
<font color="#009900">+</font>
<font color="#009900">+PACKAGES_prepend = "wpa-supplicant-passphrase "</font>
<font color="#009900">+FILES_wpa-supplicant-passphrase = "/usr/sbin/wpa_passphrase"</font>
<font color="#009900">+</font>
<font color="#009900">+RREPLACES = "wpa-supplicant-cli"</font>
<font color="#009900">+</font>
<font color="#009900">+RRECOMMENDS_${PN} = "wpa-supplicant-passphrase"</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">+do_configure () {</font>
<font color="#009900">+ install -m 0755 ${WORKDIR}/defconfig-gnutls .config</font>
<font color="#009900">+</font>
<font color="#009900">+ if [ "x$HAS_PCI" == "x1" ] ; then</font>
<font color="#009900">+ echo "CONFIG_DRIVER_MADWIFI=y" >> .config</font>
<font color="#009900">+ echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .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}</font>
<font color="#009900">+ install -m 755 wpa_supplicant ${D}${sbindir}</font>
<font color="#009900">+ install -m 755 wpa_passphrase ${D}${sbindir}</font>
<font color="#009900">+ install -m 755 wpa_cli ${D}${sbindir}</font>
<font color="#009900">+</font>
<font color="#009900">+ install -d ${D}${localstatedir}/run/wpa_supplicant</font>
<font color="#009900">+</font>
<font color="#009900">+ install -d ${D}${docdir}/wpa_supplicant</font>
<font color="#009900">+ install -m 644 README ${D}${docdir}/wpa_supplicant</font>
<font color="#009900">+</font>
<font color="#009900">+ install -d ${D}${sysconfdir}/network/if-pre-up.d/</font>
<font color="#009900">+ install -d ${D}${sysconfdir}/network/if-post-down.d/</font>
<font color="#009900">+ install -d ${D}${sysconfdir}/network/if-down.d/</font>
<font color="#009900">+</font>
<font color="#009900">+ install -d ${D}${sysconfdir}/wpa_supplicant</font>
<font color="#009900">+ install -m 755 ${WORKDIR}/ifupdown.sh ${D}${sysconfdir}/wpa_supplicant/</font>
<font color="#009900">+ install -m 755 ${WORKDIR}/functions.sh ${D}${sysconfdir}/wpa_supplicant</font>
<font color="#009900">+ </font>
<font color="#009900">+ ln -s /etc/wpa_supplicant/ifupdown.sh ${D}${sysconfdir}/network/if-pre-up.d/wpasupplicant</font>
<font color="#009900">+ ln -s /etc/wpa_supplicant/ifupdown.sh ${D}${sysconfdir}/network/if-post-down.d/wpasupplicant</font>
<font color="#009900">+}</font>
============================================================
<font color="#FF6600">--- classes/kernel.bbclass 0e7bc22f0cbc8ab0efe1c7ffb69e9171f99a8b21</font>
<font color="#009900">+++ classes/kernel.bbclass 8d92c5a7b6420490dd6b3115e8146b3fc0a0f854</font>
<font color="#0000FF">@@ -470,7 +470,10 @@ do_deploy() {</font>
install -d ${DEPLOY_DIR_IMAGE}
install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
<font color="#009900">+</font>
<font color="#009900">+ if [ -d "${D}lib" ]; then</font>
tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE}.tgz -C ${D} lib
<font color="#009900">+ fi</font>
if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then
if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
============================================================
<font color="#FF6600">--- conf/distro/include/sane-srcrevs.inc 521cedb389bc68d1f7ab5ea2240153394d425295</font>
<font color="#009900">+++ conf/distro/include/sane-srcrevs.inc af1d08078aa8f03db44e8b150bc4f043ad26b938</font>
<font color="#0000FF">@@ -37,7 +37,7 @@ SRCREV_pn-gpe-contacts ?= "9312"</font>
SRCREV_pn-gconf-dbus ?= "641"
SRCREV_pn-gnuradio ?= "6377"
SRCREV_pn-gpe-contacts ?= "9312"
<font color="#FF6600">-SRCREV_pn-gsm0710muxd ?= "193"</font>
<font color="#009900">+SRCREV_pn-gsm0710muxd ?= "263"</font>
SRCREV_pn-gtkhtml2 ?= "1158"
SRCREV_pn-gypsy ?= "134"
SRCREV_pn-hildon-1 ?= "14429"
============================================================
<font color="#FF6600">--- conf/machine/at32stk1000.conf 3d5142529536576aea6056c6d761540974caa5ac</font>
<font color="#009900">+++ conf/machine/at32stk1000.conf 163fd78fdfe07eb3befe4b759102820ed434730b</font>
<font color="#0000FF">@@ -22,8 +22,9 @@ KERNEL_IMAGETYPE = "uImage"</font>
EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"
KERNEL_IMAGETYPE = "uImage"
<font color="#FF6600">-PREFERRED_VERSION_u-boot = "1.1.4"</font>
<font color="#009900">+PREFERRED_VERSION_u-boot = "1.3.2"</font>
<font color="#009900">+UBOOT_MACHINE = "atstk1002_config"</font>
UBOOT_ENTRYPOINT = "0x90000000"
UBOOT_LOADADDRESS = "0x10000000"
============================================================
<font color="#FF6600">--- conf/machine/om-gta02.conf bb34d745d24d709bd9a6fe113c95e816ba6c788a</font>
<font color="#009900">+++ conf/machine/om-gta02.conf 8a81b5b7224a98d62de1611265a26386dc77b5f2</font>
<font color="#0000FF">@@ -34,6 +34,7 @@ ROOT_FLASH_SIZE = "256"</font>
ROOT_FLASH_SIZE = "256"
# extra jffs2 tweaks
<font color="#009900">+IMAGE_FSTYPES ?= "jffs2"</font>
EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \
--no-cleanmarkers --pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \
--littleendian --pad \
<font color="#0000FF">@@ -45,7 +46,3 @@ include conf/machine/include/tune-arm920</font>
# tune for S3C24x0
include conf/machine/include/tune-arm920t.inc
<font color="#FF6600">-</font>
<font color="#FF6600">-# build YAFFS2</font>
<font color="#FF6600">-IMAGE_FSTYPES ?= "jffs2 yaffs2"</font>
<font color="#FF6600">-</font>
============================================================
<font color="#FF6600">--- contrib/mtn2git/update-script.example 9f8caa85b400e9a7af49d8714a42648ffc346027</font>
<font color="#009900">+++ contrib/mtn2git/update-script.example d6ef8840e9ca1f2ae57480d782ecc1eddc7430a1</font>
<font color="#0000FF">@@ -22,9 +22,9 @@ cd openembedded-git</font>
# Push all changes to the server, update the master tag as well
<font color="#FF6600">-for branch in dev dreambox documentation oetest oz354x packaged-staging oz354fam083 angstrom-2007.12-stable entity stable;</font>
<font color="#009900">+for branch in `mtn --db ../../OE.mtn ls branches`;</font>
do
<font color="#FF6600">- git-push --force git+ssh://ABC@repo.or.cz/srv/git/org.openembedded.dev.git org.openembedded.$branch;</font>
<font color="#009900">+ git-push --force git+ssh://zecke2@repo.or.cz/srv/git/org.openembedded.dev.git $branch;</font>
done
#dev is our master
============================================================
<font color="#FF6600">--- packages/gnuradio/gnuradio.inc f3784a8b6e3c9fcbccabd3014638b35285a1adba</font>
<font color="#009900">+++ packages/gnuradio/gnuradio.inc 2b1aa21c076bc1d46a68628c02898068873279c0</font>
<font color="#0000FF">@@ -4,7 +4,7 @@ DEPENDS = " guile-native fftwf python li</font>
LICENSE = "GPL"
DEPENDS = " guile-native fftwf python libusb virtual/libsdl alsa-lib jack boost cppunit sdcc-native swig-native"
<font color="#FF6600">-RDEPENDS_${PN} = "python-core python-audio python-codecs python-lang python-textutils"</font>
<font color="#009900">+RDEPENDS_${PN} = "python-core python-audio python-threading python-codecs python-lang python-textutils"</font>
RDEPENDS_gnuradio-usrp = "python-core"
inherit autotools pkgconfig
============================================================
<font color="#FF6600">--- packages/gnuradio/gnuradio_3.0.4.bb e935ec6d343e8fdb415db8992f198c118b3780af</font>
<font color="#009900">+++ packages/gnuradio/gnuradio_3.0.4.bb 9f16e9d9d4673c6cb75c8bb01e3dfea2cb2da338</font>
<font color="#0000FF">@@ -1,6 +1,6 @@ require gnuradio.inc</font>
require gnuradio.inc
<font color="#FF6600">-PR = "r0"</font>
<font color="#009900">+PR = "r1"</font>
SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-${PV}.tar.gz \
file://no-trellis-doc.patch;patch=1 \
============================================================
<font color="#FF6600">--- packages/gnuradio/gnuradio_3.1.2.bb e935ec6d343e8fdb415db8992f198c118b3780af</font>
<font color="#009900">+++ packages/gnuradio/gnuradio_3.1.2.bb 9f16e9d9d4673c6cb75c8bb01e3dfea2cb2da338</font>
<font color="#0000FF">@@ -1,6 +1,6 @@ require gnuradio.inc</font>
require gnuradio.inc
<font color="#FF6600">-PR = "r0"</font>
<font color="#009900">+PR = "r1"</font>
SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-${PV}.tar.gz \
file://no-trellis-doc.patch;patch=1 \
============================================================
<font color="#FF6600">--- packages/gnuradio/gnuradio_svn.bb c208d7c99e0267f8380bd0efe7d3d2bffdfb6247</font>
<font color="#009900">+++ packages/gnuradio/gnuradio_svn.bb 351ac3dd01f04c457e29330a4098d8cf3271cb1e</font>
<font color="#0000FF">@@ -3,7 +3,7 @@ PV = "3.0.4+svnr${SRCREV}"</font>
DEFAULT_PREFERENCE = "-1"
PV = "3.0.4+svnr${SRCREV}"
<font color="#FF6600">-PR = "r2"</font>
<font color="#009900">+PR = "r3"</font>
SRC_URI = "svn://gnuradio.org/svn/gnuradio;module=trunk;proto=http \
file://no-trellis-doc.patch;patch=1 \
============================================================
<font color="#FF6600">--- packages/images/unslung-image.bb e4cf81045fb8a8e211e464905d1b307c49987663</font>
<font color="#009900">+++ packages/images/unslung-image.bb 738ce981801bef8a0c76499a9524887eeb1547ff</font>
<font color="#0000FF">@@ -100,4 +100,12 @@ nslu2_pack_image () {</font>
-m ${STAGING_FIRMWARE_DIR}/NPE-B \
-t ${STAGING_LIBDIR}/nslu2-binaries/Trailer \
-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2.bin
<font color="#009900">+ slugimage -F -p \</font>
<font color="#009900">+ -b ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \</font>
<font color="#009900">+ -s ${STAGING_LIBDIR}/nslu2-binaries/SysConf \</font>
<font color="#009900">+ -k ${DEPLOY_DIR_IMAGE}/zImage-${MACHINE}.bin \</font>
<font color="#009900">+ -r Ramdisk:1,Flashdisk:${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \</font>
<font color="#009900">+ -m ${STAGING_FIRMWARE_DIR}/NPE-B \</font>
<font color="#009900">+ -t ${STAGING_LIBDIR}/nslu2-binaries/Trailer \</font>
<font color="#009900">+ -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2-16mb.bin</font>
}
============================================================
<font color="#FF6600">--- packages/meta/slugos-packages.bb a8de050f9b9bde46ec2fe91cdf9d93c69da445cb</font>
<font color="#009900">+++ packages/meta/slugos-packages.bb 46c8ac8a7503c5e222ee23a677a92db2e2ea9dcb</font>
<font color="#0000FF">@@ -5,7 +5,7 @@ LICENSE = "MIT"</font>
DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
<font color="#FF6600">-PR = "r50"</font>
<font color="#009900">+PR = "r51"</font>
CONFLICTS = "db3"
COMPATIBLE_MACHINE = "nslu2|ixp4xx"
<font color="#0000FF">@@ -176,6 +176,7 @@ SLUGOS_PACKAGES = "\</font>
openobex-apps \
openntpd \
openobex \
<font color="#009900">+ openocd \</font>
openssh \
openvpn \
patch \
<font color="#0000FF">@@ -216,6 +217,7 @@ SLUGOS_PACKAGES = "\</font>
sudo \
sysfsutils \
tar \
<font color="#009900">+ task-mokogateway-everything \</font>
tcpdump \
thttpd \
tiff \
<font color="#0000FF">@@ -262,7 +264,6 @@ SLUGOS_BROKEN_PACKAGES = "\</font>
pwc \
qc-usb-messenger \
syslog-ng \
<font color="#FF6600">- openocd task-mokogateway-everything \</font>
task-native-sdk \
unionfs-modules unionfs-utils \
wview-sim-mysql wview-wxt510-mysql wview-vpro-mysql \
============================================================
<font color="#FF6600">--- packages/openocd/openocd_svn.bb ff4b08ed923a74c3efa4730980288907a11baeb7</font>
<font color="#009900">+++ packages/openocd/openocd_svn.bb 5863de22800841c9bcd0fe5b4014ef3d911f91a2</font>
<font color="#0000FF">@@ -2,7 +2,7 @@ PV = "0.0+r${SRCREV}"</font>
HOMEPAGE = "http://openocd.berlios.de/"
LICENSE = "GPL"
PV = "0.0+r${SRCREV}"
<font color="#FF6600">-PR = "r1"</font>
<font color="#009900">+PR = "r2"</font>
inherit autotools
<font color="#0000FF">@@ -10,4 +10,5 @@ S = "${WORKDIR}/trunk"</font>
file://openocd-link-static.patch;patch=1"
S = "${WORKDIR}/trunk"
<font color="#009900">+DEPENDS = "libftdi"</font>
EXTRA_OECONF = " --enable-ft2232_libftdi --disable-ftdi2232 --disable-ftd2xx"
============================================================
<font color="#FF6600">--- packages/rsync/rsync.inc 7c3e306cf41e043732b6fedbc8c41ebc491fedaf</font>
<font color="#009900">+++ packages/rsync/rsync.inc 1d1f2cbe00f4779bdc3dc7f9689611d817e90259</font>
<font color="#0000FF">@@ -7,6 +7,8 @@ inherit autotools</font>
inherit autotools
<font color="#009900">+SRC_URI = "http://rsync.samba.org/ftp/rsync/old-versions/rsync-${PV}.tar.gz"</font>
<font color="#009900">+</font>
EXTRA_OEMAKE='STRIP=""'
do_install_append() {
============================================================
<font color="#FF6600">--- packages/rsync/rsync_2.6.9.bb 46d56c1ae65397da35a2b8871cfecde62e0a382e</font>
<font color="#009900">+++ packages/rsync/rsync_2.6.9.bb 1b1f42efd8d5dc944a9638cd0678259c995c08dd</font>
<font color="#0000FF">@@ -2,5 +2,4 @@ PR = "r2"</font>
PR = "r2"
<font color="#009900">+SRC_URI += "file://rsyncd.conf"</font>
<font color="#FF6600">-SRC_URI = "http://rsync.samba.org/ftp/rsync/old-versions/rsync-${PV}.tar.gz \</font>
<font color="#FF6600">- file://rsyncd.conf"</font>
============================================================
<font color="#FF6600">--- packages/rsync/rsync_3.0.0.bb 265d3e5b7ec96ad6b092880621ccd67844dd9dc7</font>
<font color="#009900">+++ packages/rsync/rsync_3.0.0.bb dd9114bcedbdbe8b612946916a35fe4a662cd34c</font>
<font color="#0000FF">@@ -2,9 +2,10 @@ PR = "r0"</font>
PR = "r0"
<font color="#FF6600">-SRC_URI = "http://rsync.samba.org/ftp/rsync/rsync-${PV}.tar.gz \</font>
<font color="#FF6600">- file://m4.patch;patch=1 \</font>
<font color="#FF6600">- file://rsyncd.conf"</font>
<font color="#009900">+SRC_URI += "\</font>
<font color="#009900">+ file://m4.patch;patch=1 \</font>
<font color="#009900">+ file://rsyncd.conf \</font>
<font color="#009900">+"</font>
do_compile_prepend() {
sed -i "s/conf_stop make_stop//" Makefile
</tt></pre>