diff options
| -rw-r--r-- | conf/distro/openwrt-sdk.conf | 26 | ||||
| -rw-r--r-- | conf/machine/fic-gta01.conf | 2 | ||||
| -rw-r--r-- | conf/machine/fic-gta02.conf | 2 | ||||
| -rwxr-xr-x | contrib/angstrom/build-feeds.sh | 8 | ||||
| -rwxr-xr-x | contrib/angstrom/build-release.sh | 12 | ||||
| -rw-r--r-- | packages/flumotion/flumotion_0.4.1.bb | 16 | ||||
| -rw-r--r-- | packages/images/base-image.bb | 6 | ||||
| -rw-r--r-- | packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/defconfig | 76 | ||||
| -rw-r--r-- | packages/linux/linux-rp_2.6.20.bb | 1 | ||||
| -rw-r--r-- | packages/linux/linux-rp_2.6.21.bb | 2 | ||||
| -rw-r--r-- | packages/linux/linux_2.6.23+2.6.24-rc5.bb | 2 | ||||
| -rw-r--r-- | packages/openmoko2/openmoko-dialer2_svn.bb | 2 | ||||
| -rw-r--r-- | packages/python/python-pygtk_2.10.4.bb | 8 | ||||
| -rw-r--r-- | packages/qt/qt4-x11-free_4.3.2.bb | 2 |
14 files changed, 131 insertions, 34 deletions
diff --git a/conf/distro/openwrt-sdk.conf b/conf/distro/openwrt-sdk.conf new file mode 100644 index 0000000000..fc760f9ea0 --- /dev/null +++ b/conf/distro/openwrt-sdk.conf @@ -0,0 +1,26 @@ +#----------------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: OpenWRT-SDK +#@DESCRIPTION: Building packages for OpenWRT using its official SDK. +# +#@COMMENT: This allows to build packages only, not the whole images. +#@COMMENT: You should install and have in path an SDK from the www.openwrt.org. +#@COMMENT: SDK installers are both host and target specific (so look in download +#@COMMENT: dir for your target). If there is no SDK for your host arch, +#@COMMENT: you can also look at downloads of x-wrt.org, a sister project. +#@COMMENT: To build a package, use command like: +#@COMMENT: DISTRO=openwrt-sdk TARGET_ARCH=<arch> bitbake <package> +#----------------------------------------------------------------------------- + +require conf/distro/generic-uclibc.conf + +# +# Header +# +DISTRO_NAME = "OpenWRT" + +# This is what lives in SDK +ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc" + +# Make sure that we have correct package dependencies for SDK-provided libs. +ASSUME_SHLIBS += "libc.so.0:uclibc libgcc_s.so.1:libgcc" diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf index 30784f0dc6..68bf1b9025 100644 --- a/conf/machine/fic-gta01.conf +++ b/conf/machine/fic-gta01.conf @@ -11,7 +11,7 @@ PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}" PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" UBOOT_ENTRYPOINT = "30008000" -MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone" +MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone vfat" MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_DISPLAY_ORIENTATION = "0" diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf index b0933868c2..25c3878ee3 100644 --- a/conf/machine/fic-gta02.conf +++ b/conf/machine/fic-gta02.conf @@ -11,7 +11,7 @@ PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}" PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" UBOOT_ENTRYPOINT = "30008000" -MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi" +MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat" MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_DISPLAY_ORIENTATION = "0" diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index 396350066c..efa622d236 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -35,16 +35,16 @@ do_report_success() { for machine in ep93xx gumstix-connex gumstix-verdex efika omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 poodle tosa hx4700 c7x0 spitz akita collie spitz do BUILD_MACHINE=$machine - BUILD_CLEAN="libtool-cross" + BUILD_CLEAN="libtool-cross qmake2-native" BUILD_TARGETS="gcc binutils automake autoconf m4 pkgconfig \ task-proper-tools mc screen \ mono perl python ruby \ gtk+ qt-x11-free qt4-x11-free \ gpe-mini-browser midori minimo openmoko-browser2 webkit-gtklauncher \ - boa cherokee lighttpd thttpd \ - gpe-gallery gpe-scap pidgin \ + apache2 boa cherokee lighttpd thttpd \ + gpe-gallery gpe-scap notecase pidgin \ gpsdrive navit \ - xmms mplayer \ + xmms mplayer quasar \ wpa-gui wifi-radar \ gpe-bluetooth bluez-gnome python-pybluez \ abiword gnumeric evince gimp \ diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh index 8b30212790..6f86cfe728 100755 --- a/contrib/angstrom/build-release.sh +++ b/contrib/angstrom/build-release.sh @@ -95,10 +95,10 @@ do done # populate feeds -for machine in ep93xx a780 efika collie ixp4xxbe -do - BUILD_MACHINE=$machine - BUILD_TARGETS="meta-angstrom-2007" - do_build -done +#for machine in ep93xx a780 efika collie ixp4xxbe +#do +# BUILD_MACHINE=$machine +# BUILD_TARGETS="meta-angstrom-2007" +# do_build +#done diff --git a/packages/flumotion/flumotion_0.4.1.bb b/packages/flumotion/flumotion_0.4.1.bb index aad4eb3382..f709086846 100644 --- a/packages/flumotion/flumotion_0.4.1.bb +++ b/packages/flumotion/flumotion_0.4.1.bb @@ -1,13 +1,19 @@ DESCRIPTION = "Fluendo Streaming Server" LICENSE = "GPL" -DEPENDS = "gstreamer python-imaging python-gst twisted python-pygtk2" -RDEPENDS = " python-resource python-pprint python-threading python-imaging python-xml python-curses python-compression python-fcntl python-pygobject python-pickle python-netclient python-datetime python-crypt python-twisted-core python-twisted-web python-lang python-zopeinterface python-textutils python-core python-gst python-misc" -RDEPENDS_${PN}-gui = "${PN} python-pygtk2 python-pycairo " -PR = "r7" +DEPENDS = "gstreamer python-imaging python-gst twisted python-pygtk" +RDEPENDS = "python-resource python-pprint python-threading \ + python-imaging python-xml python-curses \ + python-compression python-fcntl python-pygobject \ + python-pickle python-netclient python-datetime \ + python-crypt python-twisted-core python-twisted-web \ + python-lang python-zopeinterface python-textutils \ + python-gst python-misc" +RDEPENDS_${PN}-gui = "${PN} python-pygtk python-pycairo" +PR = "r9" SRC_URI = "http://www.flumotion.net/src/flumotion/flumotion-${PV}.tar.bz2 \ file://python-path.patch;patch=1 \ - file://no-check-for-python-stuff.patch;patch=1" + file://no-check-for-python-stuff.patch;patch=1" inherit autotools distutils-base pkgconfig diff --git a/packages/images/base-image.bb b/packages/images/base-image.bb index 20a5fd9445..36760ec499 100644 --- a/packages/images/base-image.bb +++ b/packages/images/base-image.bb @@ -24,7 +24,8 @@ DEPENDS = "\ task-distro-base task-machine-base \ ${DISTRO_SSH_DAEMON} \ ${DISTRO_PACKAGE_MANAGER} \ - task-base-usbhost task-base-ext2 \ + ${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \ + ${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \ " IMAGE_INSTALL = "\ @@ -32,7 +33,8 @@ IMAGE_INSTALL = "\ task-distro-base task-machine-base \ ${DISTRO_SSH_DAEMON} \ ${DISTRO_PACKAGE_MANAGER} \ - task-base-usbhost task-base-ext2 \ + ${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \ + ${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \ " export IMAGE_BASENAME = "base-image" diff --git a/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/defconfig b/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/defconfig index c036ac7215..57a98014b3 100644 --- a/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/defconfig +++ b/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.24-rc5 -# Sat Dec 15 16:31:42 2007 +# Tue Dec 18 12:02:51 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -315,6 +315,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set # CONFIG_NET_SCHED is not set +CONFIG_NET_SCH_FIFO=y # # Network testing @@ -328,10 +329,18 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # # Wireless # -# CONFIG_CFG80211 is not set -# CONFIG_WIRELESS_EXT is not set -# CONFIG_MAC80211 is not set -# CONFIG_IEEE80211 is not set +CONFIG_CFG80211=m +CONFIG_NL80211=y +CONFIG_WIRELESS_EXT=y +CONFIG_MAC80211=m +CONFIG_MAC80211_RCSIMPLE=y +# CONFIG_MAC80211_DEBUG is not set +CONFIG_IEEE80211=m +# CONFIG_IEEE80211_DEBUG is not set +# CONFIG_IEEE80211_CRYPT_WEP is not set +# CONFIG_IEEE80211_CRYPT_CCMP is not set +# CONFIG_IEEE80211_CRYPT_TKIP is not set +# CONFIG_IEEE80211_SOFTMAC is not set # CONFIG_RFKILL is not set # CONFIG_NET_9P is not set @@ -525,7 +534,18 @@ CONFIG_DM9000=y # Wireless LAN # # CONFIG_WLAN_PRE80211 is not set -# CONFIG_WLAN_80211 is not set +CONFIG_WLAN_80211=y +CONFIG_LIBERTAS=m +# CONFIG_LIBERTAS_USB is not set +CONFIG_LIBERTAS_SDIO=m +# CONFIG_LIBERTAS_DEBUG is not set +# CONFIG_USB_ZD1201 is not set +# CONFIG_RTL8187 is not set +# CONFIG_P54_COMMON is not set +# CONFIG_HOSTAP is not set +# CONFIG_B43 is not set +# CONFIG_B43LEGACY is not set +# CONFIG_RT2X00 is not set # # USB Network Adapters @@ -984,7 +1004,7 @@ CONFIG_USB_MON=y # # CONFIG_USB_GADGET is not set CONFIG_MMC=m -CONFIG_MMC_DEBUG=y +# CONFIG_MMC_DEBUG=y # CONFIG_MMC_UNSAFE_RESUME is not set # @@ -1178,7 +1198,47 @@ CONFIG_FRAME_POINTER=y # CONFIG_KEYS is not set # CONFIG_SECURITY is not set # CONFIG_SECURITY_FILE_CAPABILITIES is not set -# CONFIG_CRYPTO is not set +CONFIG_CRYPTO=y +CONFIG_CRYPTO_ALGAPI=m +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_MANAGER=m +# CONFIG_CRYPTO_HMAC is not set +# CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_MD4 is not set +# CONFIG_CRYPTO_MD5 is not set +# CONFIG_CRYPTO_SHA1 is not set +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_WP512 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_GF128MUL is not set +CONFIG_CRYPTO_ECB=m +# CONFIG_CRYPTO_CBC is not set +# CONFIG_CRYPTO_PCBC is not set +# CONFIG_CRYPTO_LRW is not set +# CONFIG_CRYPTO_XTS is not set +# CONFIG_CRYPTO_CRYPTD is not set +# CONFIG_CRYPTO_DES is not set +# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_TWOFISH is not set +# CONFIG_CRYPTO_SERPENT is not set +CONFIG_CRYPTO_AES=m +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +# CONFIG_CRYPTO_TEA is not set +CONFIG_CRYPTO_ARC4=m +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_SEED is not set +# CONFIG_CRYPTO_DEFLATE is not set +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_TEST is not set +# CONFIG_CRYPTO_AUTHENC is not set +CONFIG_CRYPTO_HW=y # # Library routines diff --git a/packages/linux/linux-rp_2.6.20.bb b/packages/linux/linux-rp_2.6.20.bb index 60305488ca..9ee189e50a 100644 --- a/packages/linux/linux-rp_2.6.20.bb +++ b/packages/linux/linux-rp_2.6.20.bb @@ -3,6 +3,7 @@ require linux-rp.inc PR = "r19" DEFAULT_PREFERENCE_poodle = "-99" +DEFAULT_PREFERENCE_collie = "1" # Handy URLs # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 diff --git a/packages/linux/linux-rp_2.6.21.bb b/packages/linux/linux-rp_2.6.21.bb index d239b2aa32..e388a0c1a4 100644 --- a/packages/linux/linux-rp_2.6.21.bb +++ b/packages/linux/linux-rp_2.6.21.bb @@ -3,7 +3,7 @@ require linux-rp.inc PR = "r12" DEFAULT_PREFERENCE_poodle = "-99" -DEFAULT_PREFERENCE_collie = "1" +DEFAULT_PREFERENCE_collie = "-1" # Handy URLs # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 diff --git a/packages/linux/linux_2.6.23+2.6.24-rc5.bb b/packages/linux/linux_2.6.23+2.6.24-rc5.bb index 05779d5071..6c3f855df9 100644 --- a/packages/linux/linux_2.6.23+2.6.24-rc5.bb +++ b/packages/linux/linux_2.6.23+2.6.24-rc5.bb @@ -3,7 +3,7 @@ require linux.inc # Mark archs/machines that this kernel supports DEFAULT_PREFERENCE = "-1" -PR = "r0" +PR = "r2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.24-rc5.bz2;patch=1 \ diff --git a/packages/openmoko2/openmoko-dialer2_svn.bb b/packages/openmoko2/openmoko-dialer2_svn.bb index 171815ef18..c5e6d269d7 100644 --- a/packages/openmoko2/openmoko-dialer2_svn.bb +++ b/packages/openmoko2/openmoko-dialer2_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "The OpenMoko Dialer" SECTION = "openmoko/pim" -DEPENDS = "libjana libmokogsmd2 libmokoui2 libmokojournal2 pulseaudio libnotify" +DEPENDS = "libjana libmokoui2 libmokojournal2 pulseaudio libnotify" PV = "0.1.0+svnr${SRCREV}" PR = "r6" PE = "1" diff --git a/packages/python/python-pygtk_2.10.4.bb b/packages/python/python-pygtk_2.10.4.bb index 9b4a034ffa..1af2093556 100644 --- a/packages/python/python-pygtk_2.10.4.bb +++ b/packages/python/python-pygtk_2.10.4.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Python GTK+ 2.10.x Bindings" SECTION = "devel/python" # needs gtk+ 2.10.x -DEPENDS = "gtk+ libglade python-pycairo" +DEPENDS = "gtk+ libglade python-pycairo python-pygobject" RDEPENDS = "python-shell python-pycairo python-pygobject" PROVIDES = "python-pygtk2" SRCNAME = "pygtk" @@ -13,8 +13,10 @@ SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar file://acinclude.m4" S = "${WORKDIR}/${SRCNAME}-${PV}" -EXTRA_OECONF = "--disable-docs" -EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../" +EXTRA_OECONF = "\ + --disable-docs \ + --with-python-includes=${STAGING_INCDIR}/../ \ +" inherit autotools pkgconfig distutils-base diff --git a/packages/qt/qt4-x11-free_4.3.2.bb b/packages/qt/qt4-x11-free_4.3.2.bb index 9b4c6be18c..2fa53a4d54 100644 --- a/packages/qt/qt4-x11-free_4.3.2.bb +++ b/packages/qt/qt4-x11-free_4.3.2.bb @@ -62,7 +62,7 @@ do_configure() { # FIXME: Might want to compile the cross tools for the -dev packages as well... do_compile() { - unset CFLAGS CXXFLAGSi + unset CFLAGS CXXFLAGS install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic |