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