diff options
27 files changed, 757 insertions, 119 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e6466618a5..2e33203f87 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -52,6 +52,14 @@ Machines: davinci (dm6446-evm, dm6467-evm, dm355-evm, dm365-evm), omap3evm Distros: Ångström, Arago Interests: External Toolchains +Person: Dmitry Eremin-Solenikov +Mail: dbaryshkov@gmail.com +Website: http://tosa.lumag.spb.ru +Interests: Kernel, Porting, evaluation hardware +Machines: tosa, tqm8540, am91sam9g20ek +Distros: Ångström +Recipes: lowpan-tools, libnl + Person: Erik Hovland Mail: erik@hovland.org Distros: familiar diff --git a/conf/checksums.ini b/conf/checksums.ini index a14c64fa73..ff8845fc98 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -18930,6 +18930,10 @@ sha256=b6bbb0dea427aa733c37d58a94b819b523c8649d7605f498348de159380c28a1 md5=b0aac48e4528aa1fa2b6759f53508643 sha256=6ae71591d0184debcafb134896577447574c8b29545af6e99f6ff09dc3448571 +[http://kernel.org/pub/linux/kernel/v2.6/testing/v2.6.25/patch-2.6.25-rc4.bz2] +md5=a4cc0fd5bda60e498246b6d69c873895 +sha256=781656a17fe24b018ab2c33c2481c2a07e9abfa9c6203995e2fbf7c852adda3a + [http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.25.20.bz2] md5=9d870b9947ce0618cf18445e4be33e15 sha256=c4d69706880f274b84c8f5ef36ce955b3173e6ea3c083f724c0371096b27e738 @@ -19398,6 +19402,10 @@ sha256=2632d931b5732eb1d0de7a2e2d92c75d64412438958ee96dceb4443e4fc2a62f md5=d04973bde34edac7dd2e50bfe8f10700 sha256=b216936e6e011b58fefee8e3f80d01008cb078b7fe2a5632b2ce98bc7bcb05c2 +[https://alioth.debian.org/frs/download.php/2867/pmount-0.9.19.tar.gz] +md5=2fd9fe103375dbd0c91af2f302250a8c +sha256=e2174f1249ea79121648bb0e9353729767654e6d430fb2d28da342ec25a179be + [http://downloads.sourceforge.net/pmt/pngcrush-1.6.4.tar.gz] md5=a329caad3f49ed3ca105e6fd441f5b93 sha256=22ffea3aed00da9a9518a9c25b619d212bbe27b9ec72165cf74640f930108b2f diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index c7e75647d0..b1b9d7b834 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -204,7 +204,7 @@ do lighttpd \ links-x11 \ lirc \ - lowpan-utils \ + lowpan-tools \ m4 \ madplay \ mahjongg \ diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh index 1cbb1e2a70..a4a262616e 100755 --- a/contrib/angstrom/build-release.sh +++ b/contrib/angstrom/build-release.sh @@ -60,7 +60,7 @@ done # No graphics -for machine in dns323 mv2120 kuropro lspro tsx09 ts409 gumstix-connex gumstix-verdex efika dht-walnut omap5912osk afeb9260 +for machine in dns323 mv2120 kuropro lspro tsx09 ts409 gumstix-connex gumstix-verdex efika dht-walnut omap5912osk afeb9260 at91sam9g20ek do BUILD_MACHINE=$machine BUILD_CLEAN="base-files" diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh index f089475cbd..ffdac86365 100755 --- a/contrib/angstrom/sort.sh +++ b/contrib/angstrom/sort.sh @@ -48,7 +48,7 @@ case "$arch" in "armv4t") machines="micro2440 ep93xx h6300 om-gta01 om-gta02 fic-gta01 fic-gta02" ;; "armv5te") - machines="htcalpine dm6446-evm dm6467-evm dm355-evm dm365-evm dm357-evm topas910 sheevaplug dm355-leopard n2100 dns323 mv2120 kuropro lspro tsx09 ts409 davinci-dvevm davinci-sffsdr neuros-osd neuros-osd2 gumstix-connex gumstix-verdex gumstix e680 a780 a1200 at91sam9263ek rokre6 rokre2 rokr-e2 akita c7x0 h2200 h3900 h4000 h5000 htcapache htctornado htcblueangel htcuniversal hx4700 nslu2le hx2000 ixp4xxle magician netbook-pro nokia770 palmt650 palmt680 palmld palmtx palmtt3 palmz72 qemuarm omap5912osk poodle spitz tosa mx27ads" ;; + machines="htcalpine dm6446-evm dm6467-evm dm355-evm dm365-evm dm357-evm topas910 sheevaplug dm355-leopard n2100 dns323 mv2120 kuropro lspro tsx09 ts409 davinci-dvevm davinci-sffsdr neuros-osd neuros-osd2 gumstix-connex gumstix-verdex gumstix e680 a780 a1200 at91sam9263ek rokre6 rokre2 rokr-e2 akita c7x0 h2200 h3900 h4000 h5000 htcapache htctornado htcblueangel htcuniversal hx4700 nslu2le hx2000 ixp4xxle magician netbook-pro nokia770 palmt650 palmt680 palmld palmtx palmtt3 palmz72 qemuarm omap5912osk poodle spitz tosa mx27ads at91sam9g20ek mainstone" ;; "armv5teb") machines="ixp4xxbe nslu2be" ;; "armv6-novfp") @@ -80,6 +80,8 @@ case "$arch" in machines="lsppchd lsppchg efika n1200" ;; "ppce300c3") machines="mpc8313e-rdb mpc8315e-rdb" ;; + "ppce500") + machines="tqm8540" ;; "sparc") machines="" ;; esac @@ -153,7 +155,7 @@ for i in `find . -name "*.ipk"| grep _all` ; do mkdir -p ../all/ || true ;mv $i mkdir -p ../sdk ; mv *sdk.ipk ../sdk/ || true (mkdir -p ../sdk ; cd ../sdk && ipkg-make-index -p Packages -m . >& /dev/null ; touch Packages.sig ) -for arch in arm-oabi armv4t armv5teb armv5te armv6-novfp armv6 armv7a armv7 avr32 bfin geode i486 i586 i686 iwmmxt ppc405 ppc603e sparc x86_64 ; do +for arch in arm-oabi armv4t armv5teb armv5te armv6-novfp armv6 armv7a armv7 avr32 bfin geode i486 i586 i686 iwmmxt ppc405 ppc603e ppce300c3 ppce500 sparc x86_64 ; do do_sort done diff --git a/recipes/linux/linux-2.6.29/tqm8540/defconfig b/recipes/linux/linux-2.6.29/tqm8540/defconfig index 3021ddcfe0..80a805ce77 100644 --- a/recipes/linux/linux-2.6.29/tqm8540/defconfig +++ b/recipes/linux/linux-2.6.29/tqm8540/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.29-rc2 -# Mon Jan 26 15:36:19 2009 +# Linux kernel version: 2.6.29 +# Sun Jul 5 15:45:43 2009 # # CONFIG_PPC64 is not set @@ -75,6 +75,15 @@ CONFIG_SYSVIPC_SYSCTL=y # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_TASKSTATS is not set # CONFIG_AUDIT is not set + +# +# RCU Subsystem +# +CONFIG_CLASSIC_RCU=y +# CONFIG_TREE_RCU is not set +# CONFIG_PREEMPT_RCU is not set +# CONFIG_TREE_RCU_TRACE is not set +# CONFIG_PREEMPT_RCU_TRACE is not set # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=14 CONFIG_GROUP_SCHED=y @@ -91,6 +100,7 @@ CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y CONFIG_EMBEDDED=y CONFIG_SYSCTL_SYSCALL=y # CONFIG_KALLSYMS is not set @@ -98,10 +108,8 @@ CONFIG_SYSCTL_SYSCALL=y CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y -CONFIG_COMPAT_BRK=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y -CONFIG_ANON_INODES=y # CONFIG_EPOLL is not set CONFIG_SIGNALFD=y CONFIG_TIMERFD=y @@ -111,6 +119,7 @@ CONFIG_AIO=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_PCI_QUIRKS=y CONFIG_SLUB_DEBUG=y +CONFIG_COMPAT_BRK=y # CONFIG_SLAB is not set CONFIG_SLUB=y # CONFIG_SLOB is not set @@ -125,7 +134,12 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 -# CONFIG_MODULES is not set +CONFIG_MODULES=y +# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_BLOCK=y # CONFIG_LBD is not set # CONFIG_BLK_DEV_IO_TRACE is not set @@ -144,11 +158,6 @@ CONFIG_DEFAULT_AS=y # CONFIG_DEFAULT_CFQ is not set # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="anticipatory" -CONFIG_CLASSIC_RCU=y -# CONFIG_TREE_RCU is not set -# CONFIG_PREEMPT_RCU is not set -# CONFIG_TREE_RCU_TRACE is not set -# CONFIG_PREEMPT_RCU_TRACE is not set # CONFIG_FREEZER is not set # @@ -350,13 +359,31 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_AF_RXRPC is not set # CONFIG_PHONET is not set CONFIG_WIRELESS=y -# CONFIG_CFG80211 is not set +CONFIG_CFG80211=m +# CONFIG_CFG80211_REG_DEBUG is not set +CONFIG_NL80211=y CONFIG_WIRELESS_OLD_REGULATORY=y CONFIG_WIRELESS_EXT=y -# CONFIG_LIB80211 is not set -# CONFIG_MAC80211 is not set +# CONFIG_WIRELESS_EXT_SYSFS is not set +CONFIG_LIB80211=m +# CONFIG_LIB80211_DEBUG is not set +CONFIG_MAC80211=m + +# +# Rate control algorithm selection +# +# CONFIG_MAC80211_RC_PID is not set +CONFIG_MAC80211_RC_MINSTREL=y +# CONFIG_MAC80211_RC_DEFAULT_PID is not set +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel" +CONFIG_MAC80211_MESH=y +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUG_MENU is not set # CONFIG_WIMAX is not set -# CONFIG_RFKILL is not set +CONFIG_RFKILL=m +CONFIG_RFKILL_INPUT=m +CONFIG_RFKILL_LEDS=y # CONFIG_NET_9P is not set # @@ -374,6 +401,7 @@ CONFIG_MTD=y # CONFIG_MTD_DEBUG is not set CONFIG_MTD_CONCAT=y CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_TESTS is not set # CONFIG_MTD_REDBOOT_PARTS is not set CONFIG_MTD_CMDLINE_PARTS=y # CONFIG_MTD_OF_PARTS is not set @@ -448,7 +476,6 @@ CONFIG_MTD_CFI_UTIL=y # LPDDR flash memory drivers # # CONFIG_MTD_LPDDR is not set -# CONFIG_MTD_QINFO_PROBE is not set # # UBI - Unsorted block images @@ -477,13 +504,19 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 # CONFIG_BLK_DEV_HD is not set CONFIG_MISC_DEVICES=y # CONFIG_PHANTOM is not set -# CONFIG_EEPROM_93CX6 is not set # CONFIG_SGI_IOC4 is not set # CONFIG_TIFM_CORE is not set # CONFIG_ICS932S401 is not set # CONFIG_ENCLOSURE_SERVICES is not set # CONFIG_HP_ILO is not set # CONFIG_C2PORT is not set + +# +# EEPROM support +# +# CONFIG_EEPROM_AT24 is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EEPROM_93CX6 is not set CONFIG_HAVE_IDE=y CONFIG_IDE=y @@ -576,10 +609,10 @@ CONFIG_PHYLIB=y # # MII PHY device drivers # -# CONFIG_MARVELL_PHY is not set +CONFIG_MARVELL_PHY=y # CONFIG_DAVICOM_PHY is not set # CONFIG_QSEMI_PHY is not set -# CONFIG_LXT_PHY is not set +CONFIG_LXT_PHY=y # CONFIG_CICADA_PHY is not set # CONFIG_VITESSE_PHY is not set # CONFIG_SMSC_PHY is not set @@ -597,6 +630,7 @@ CONFIG_MII=y # CONFIG_SUNGEM is not set # CONFIG_CASSINI is not set # CONFIG_NET_VENDOR_3COM is not set +# CONFIG_DNET is not set # CONFIG_NET_TULIP is not set # CONFIG_HP100 is not set # CONFIG_IBM_NEW_EMAC_ZMII is not set @@ -648,6 +682,7 @@ CONFIG_GIANFAR=y # CONFIG_QLA3XXX is not set # CONFIG_ATL1 is not set # CONFIG_ATL1E is not set +# CONFIG_ATL1C is not set # CONFIG_JME is not set CONFIG_NETDEV_10000=y # CONFIG_CHELSIO_T1 is not set @@ -666,6 +701,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y # CONFIG_BNX2X is not set # CONFIG_QLGE is not set # CONFIG_SFC is not set +# CONFIG_BE2NET is not set # CONFIG_TR is not set # @@ -746,7 +782,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_SERIAL_JSM is not set -# CONFIG_SERIAL_OF_PLATFORM is not set +CONFIG_SERIAL_OF_PLATFORM=y CONFIG_UNIX98_PTYS=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set CONFIG_LEGACY_PTYS=y @@ -755,8 +791,6 @@ CONFIG_LEGACY_PTY_COUNT=256 # CONFIG_IPMI_HANDLER is not set CONFIG_HW_RANDOM=y # CONFIG_NVRAM is not set -CONFIG_GEN_RTC=y -# CONFIG_GEN_RTC_X is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set # CONFIG_RAW_DRIVER is not set @@ -811,13 +845,12 @@ CONFIG_I2C_MPC=y # Other I2C/SMBus bus drivers # # CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_I2C_STUB is not set # # Miscellaneous I2C Chip support # # CONFIG_DS1682 is not set -# CONFIG_EEPROM_AT24 is not set -# CONFIG_EEPROM_LEGACY is not set # CONFIG_SENSORS_PCF8574 is not set # CONFIG_PCF8575 is not set # CONFIG_SENSORS_PCA9539 is not set @@ -979,12 +1012,95 @@ CONFIG_USB_ARCH_HAS_EHCI=y # CONFIG_UWB is not set # CONFIG_MMC is not set # CONFIG_MEMSTICK is not set -# CONFIG_NEW_LEDS is not set +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=m + +# +# LED drivers +# +# CONFIG_LEDS_PCA9532 is not set +# CONFIG_LEDS_PCA955X is not set + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=m +# CONFIG_LEDS_TRIGGER_IDE_DISK is not set +CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_LEDS_TRIGGER_BACKLIGHT=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m # CONFIG_ACCESSIBILITY is not set # CONFIG_INFINIBAND is not set # CONFIG_EDAC is not set -# CONFIG_RTC_CLASS is not set -# CONFIG_DMADEVICES is not set +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +CONFIG_RTC_INTF_DEV_UIE_EMUL=y +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +CONFIG_RTC_DRV_DS1307=y +# CONFIG_RTC_DRV_DS1374 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_MAX6900 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_PCF8583 is not set +# CONFIG_RTC_DRV_M41T80 is not set +# CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_FM3130 is not set +# CONFIG_RTC_DRV_RX8581 is not set + +# +# SPI RTC drivers +# + +# +# Platform RTC drivers +# +# CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_DS1286 is not set +# CONFIG_RTC_DRV_DS1511 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T35 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_BQ4802 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# +CONFIG_RTC_DRV_PPC=y +CONFIG_DMADEVICES=y + +# +# DMA Devices +# +CONFIG_FSL_DMA=m +CONFIG_DMA_ENGINE=y + +# +# DMA Clients +# +CONFIG_NET_DMA=y +# CONFIG_DMATEST is not set # CONFIG_UIO is not set # CONFIG_STAGING is not set @@ -1174,12 +1290,20 @@ CONFIG_CRYPTO=y # Crypto core or helper # # CONFIG_CRYPTO_FIPS is not set -# CONFIG_CRYPTO_MANAGER is not set -# CONFIG_CRYPTO_MANAGER2 is not set +CONFIG_CRYPTO_ALGAPI=m +CONFIG_CRYPTO_ALGAPI2=m +CONFIG_CRYPTO_AEAD2=m +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_BLKCIPHER2=m +CONFIG_CRYPTO_HASH2=m +CONFIG_CRYPTO_RNG2=m +CONFIG_CRYPTO_MANAGER=m +CONFIG_CRYPTO_MANAGER2=m # CONFIG_CRYPTO_GF128MUL is not set # CONFIG_CRYPTO_NULL is not set # CONFIG_CRYPTO_CRYPTD is not set # CONFIG_CRYPTO_AUTHENC is not set +# CONFIG_CRYPTO_TEST is not set # # Authenticated Encryption with Associated Data @@ -1194,7 +1318,7 @@ CONFIG_CRYPTO=y # CONFIG_CRYPTO_CBC is not set # CONFIG_CRYPTO_CTR is not set # CONFIG_CRYPTO_CTS is not set -# CONFIG_CRYPTO_ECB is not set +CONFIG_CRYPTO_ECB=m # CONFIG_CRYPTO_LRW is not set # CONFIG_CRYPTO_PCBC is not set # CONFIG_CRYPTO_XTS is not set @@ -1227,7 +1351,7 @@ CONFIG_CRYPTO=y # CONFIG_CRYPTO_AES=m # CONFIG_CRYPTO_ANUBIS is not set -# CONFIG_CRYPTO_ARC4 is not set +CONFIG_CRYPTO_ARC4=m # CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_CAMELLIA is not set # CONFIG_CRYPTO_CAST5 is not set diff --git a/recipes/linux/linux-mainstone/0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch b/recipes/linux/linux-mainstone/0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch new file mode 100644 index 0000000000..9d7020d9f1 --- /dev/null +++ b/recipes/linux/linux-mainstone/0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch @@ -0,0 +1,15 @@ +Index: linux-2.6.24/include/linux/time.h +=================================================================== +--- a/include/linux/time.h ++++ b/include/linux/time.h +@@ -172,6 +172,10 @@ static inline void timespec_add_ns(struct timespec *a, u64 ns) + { + ns += a->tv_nsec; + while(unlikely(ns >= NSEC_PER_SEC)) { ++ /* The following asm() prevents the compiler from ++ * optimising this loop into a modulo operation. */ ++ asm("" : "+r"(ns)); ++ + ns -= NSEC_PER_SEC; + a->tv_sec++; + } diff --git a/recipes/linux/linux-mainstone_2.6.25.bb b/recipes/linux/linux-mainstone_2.6.25.bb index d9599ef76c..f2d972dd78 100644 --- a/recipes/linux/linux-mainstone_2.6.25.bb +++ b/recipes/linux/linux-mainstone_2.6.25.bb @@ -3,11 +3,12 @@ require linux.inc SECTION = "kernel" DESCRIPTION = "Linux kernel for the Mainstone (PXA270 ref design)" LICENSE = "GPL" -PR = "r0" +PR = "r1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.25/patch-2.6.25-rc4.bz2;patch=1 \ file://mainstone-keypad.patch;patch=1 \ + file://0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch;patch=1 \ file://defconfig" S = "${WORKDIR}/linux-2.6.24" diff --git a/recipes/linux/linux_2.6.29.bb b/recipes/linux/linux_2.6.29.bb index 8f48dbcf3c..f1733ea197 100644 --- a/recipes/linux/linux_2.6.29.bb +++ b/recipes/linux/linux_2.6.29.bb @@ -1,6 +1,6 @@ require linux.inc -PR = "r6" +PR = "r7" S = "${WORKDIR}/linux-2.6.29" diff --git a/recipes/lowpan-tools/lowpan-tools_git.bb b/recipes/lowpan-tools/lowpan-tools_git.bb index 307984498e..78b6fa2792 100644 --- a/recipes/lowpan-tools/lowpan-tools_git.bb +++ b/recipes/lowpan-tools/lowpan-tools_git.bb @@ -1,16 +1,17 @@ DESCRIPTION = "LoWPAN utilities (IEEE802.15.4)" LICENSE = "GPL" -SRCREV = "28639544fa2496ae6f82ef300ffc9e6543c4bcd0" +SRCREV = "b30f459c9ef500b73043d105597f382ec4f53f1b" SRC_URI = "git://linux-zigbee.git.sourceforge.net/gitroot/linux-zigbee;protocol=git" DEPENDS = "libnl bison-native flex-native" -PR = "r7" +PR = "r8" S = "${WORKDIR}/git" PACKAGES += "${PN}-tests-dbg" PACKAGES += "${PN}-tests" FILES_${PN} = "${sbindir}/iz ${sbindir}/izconfig \ ${bindir}/izchat ${bindir}/izlisten ${sbindir}/izcoordinator \ - ${sbindir}/izattach" + ${sbindir}/izattach ${libdir}/ip/link_wpan.so" +FILES_${PN}-dbg += "${libdir}/ip/.debug/link_wpan.so" FILES_${PN}-tests = "${libexecdir}/lowpan-tools ${libdir}/python*/site-packages" FILES_${PN}-tests-dbg = "${libexecdir}/lowpan-tools/.debug" diff --git a/recipes/pmount/pmount-0.9.18/gettext.patch b/recipes/pmount/pmount-0.9.18/gettext.patch index dbac93f6ba..a784e32440 100644 --- a/recipes/pmount/pmount-0.9.18/gettext.patch +++ b/recipes/pmount/pmount-0.9.18/gettext.patch @@ -1,7 +1,7 @@ -Index: pmount-0.9.17/src/pmount-hal.c +Index: pmount-0.9.18/src/pmount-hal.c =================================================================== ---- pmount-0.9.17.orig/src/pmount-hal.c 2007-07-01 13:58:49.000000000 +0200 -+++ pmount-0.9.17/src/pmount-hal.c 2008-10-08 23:39:20.970178412 +0200 +--- pmount-0.9.18.orig/src/pmount-hal.c 2008-10-09 23:19:46.000000000 +0200 ++++ pmount-0.9.18/src/pmount-hal.c 2009-07-12 17:16:00.719122863 +0200 @@ -16,7 +16,6 @@ #include <dirent.h> #include <sys/stat.h> @@ -10,54 +10,77 @@ Index: pmount-0.9.17/src/pmount-hal.c #include <libhal-storage.h> #include "policy.h" -@@ -26,7 +25,12 @@ - #include "realpath.h" +@@ -25,9 +24,6 @@ - /* gettext abbreviation */ -+#ifdef ENABLE_NLS -+#include <libintl.h> - #define _(String) gettext(String) -+#else -+#define _(String) (String) -+#endif + #include "realpath.h" +-/* gettext abbreviation */ +-#define _(String) gettext(String) +- void help() { puts( _( -@@ -196,10 +200,12 @@ - char *dmask = NULL; - char *iocharset = NULL; + "pmount-hal - execute pmount with additional information from hal\n\n" +@@ -198,8 +194,8 @@ -+#ifdef ENABLE_NLS /* initialize locale */ setlocale( LC_ALL, "" ); - bindtextdomain( "pmount", NULL ); - textdomain( "pmount" ); -+#endif +- bindtextdomain( "pmount", NULL ); +- textdomain( "pmount" ); ++ bindtextdomain(PACKAGE, NULL ); ++ textdomain(PACKAGE); if( argc < 2 ) { help(); -Index: pmount-0.9.17/src/utils.h +Index: pmount-0.9.18/src/utils.h =================================================================== ---- pmount-0.9.17.orig/src/utils.h 2007-07-07 09:05:06.000000000 +0200 -+++ pmount-0.9.17/src/utils.h 2008-10-08 23:19:09.515475595 +0200 -@@ -12,7 +12,12 @@ +--- pmount-0.9.18.orig/src/utils.h 2008-10-09 23:19:46.000000000 +0200 ++++ pmount-0.9.18/src/utils.h 2009-07-12 17:23:01.384780369 +0200 +@@ -12,8 +12,31 @@ #define __utils_h /* gettext abbreviation */ +#ifdef ENABLE_NLS ++ +#include <libintl.h> ++ #define _(String) gettext(String) + ++#ifdef gettext_noop ++#define N_(String) gettext_noop(String) +#else -+#define _(String) (String) ++#define N_(String) (String) +#endif - ++ ++#else /* NLS is disabled */ ++ ++#define _(String) (String) ++#define N_(String) (String) ++#define textdomain(String) (String) ++#define gettext(String) (String) ++#define dgettext(Domain,String) (String) ++#define dcgettext(Domain,String,Type) (String) ++#define bindtextdomain(Domain,Directory) (Domain) ++#define bind_textdomain_codeset(Domain,Codeset) (Codeset) ++ ++#endif /* ENABLE_NLS */ ++ /* global flag whether to print debug messages (false by default) */ extern int enable_debug; -Index: pmount-0.9.17/configure.ac + +Index: pmount-0.9.18/configure.ac =================================================================== ---- pmount-0.9.17.orig/configure.ac 2007-12-14 20:27:23.000000000 +0100 -+++ pmount-0.9.17/configure.ac 2008-10-08 23:19:09.598820915 +0200 -@@ -77,10 +77,7 @@ +--- pmount-0.9.18.orig/configure.ac 2008-10-18 21:02:18.000000000 +0200 ++++ pmount-0.9.18/configure.ac 2009-07-12 17:16:00.719122863 +0200 +@@ -5,8 +5,6 @@ + AC_CONFIG_SRCDIR(src) + AM_INIT_AUTOMAKE(pmount, 0.9.18) + +-AC_PROG_INTLTOOL([0.21]) +- + AM_MAINTAINER_MODE + AC_ISC_POSIX + AC_HEADER_STDC +@@ -77,10 +75,13 @@ fi AM_CONDITIONAL(PMOUNT_HAL, test -n "$BUILD_HAL") @@ -65,69 +88,110 @@ Index: pmount-0.9.17/configure.ac -AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package]) -AM_GLIB_GNU_GETTEXT ++ ++IT_PROG_INTLTOOL([0.21]) ++GETTEXT_PACKAGE=$PACKAGE ++AC_SUBST([GETTEXT_PACKAGE]) ++AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package]) +AM_GNU_GETTEXT([external]) ++AM_GNU_GETTEXT_VERSION([0.17]) AC_OUTPUT([ Makefile -Index: pmount-0.9.17/src/pmount.c +Index: pmount-0.9.18/src/pmount.c =================================================================== ---- pmount-0.9.17.orig/src/pmount.c 2008-10-08 23:36:44.452037557 +0200 -+++ pmount-0.9.17/src/pmount.c 2008-10-08 23:37:38.778816969 +0200 -@@ -21,9 +21,12 @@ +--- pmount-0.9.18.orig/src/pmount.c 2008-10-18 20:49:54.000000000 +0200 ++++ pmount-0.9.18/src/pmount.c 2009-07-12 17:16:00.722456315 +0200 +@@ -21,7 +21,6 @@ #include <errno.h> #include <locale.h> #include <langinfo.h> -#include <libintl.h> #include <sys/stat.h> -+#ifdef ENABLE_NLS -+#include <libintl.h> -+#endif -+ #include "fs.h" - #include "policy.h" - #include "utils.h" -@@ -619,10 +622,12 @@ - { NULL, 0, NULL, 0} - }; +@@ -652,8 +651,8 @@ -+#ifdef ENABLE_NLS /* initialize locale */ setlocale( LC_ALL, "" ); - bindtextdomain( "pmount", NULL ); - textdomain( "pmount" ); -+#endif +- bindtextdomain( "pmount", NULL ); +- textdomain( "pmount" ); ++ bindtextdomain(PACKAGE, NULL ); ++ textdomain(PACKAGE); /* If pmount is run without a single argument, print out the list of removable devices. Does not require root privileges, just read access -Index: pmount-0.9.17/src/pumount.c +Index: pmount-0.9.18/src/pumount.c =================================================================== ---- pmount-0.9.17.orig/src/pumount.c 2008-10-08 23:38:21.122028300 +0200 -+++ pmount-0.9.17/src/pumount.c 2008-10-08 23:38:47.972023678 +0200 -@@ -16,9 +16,12 @@ +--- pmount-0.9.18.orig/src/pumount.c 2008-10-09 23:19:46.000000000 +0200 ++++ pmount-0.9.18/src/pumount.c 2009-07-12 17:16:00.722456315 +0200 +@@ -16,9 +16,9 @@ #include <sys/wait.h> #include <limits.h> #include <getopt.h> -#include <libintl.h> #include <locale.h> -+#ifdef ENABLE_NLS -+#include <libintl.h> -+#endif + #include "policy.h" #include "utils.h" #include "luks.h" -@@ -172,10 +175,12 @@ - { NULL, 0, NULL, 0} - }; +@@ -174,8 +174,8 @@ -+#ifdef ENABLE_NLS /* initialize locale */ setlocale( LC_ALL, "" ); - bindtextdomain( "pmount", NULL ); - textdomain( "pmount" ); -+#endif +- bindtextdomain( "pmount", NULL ); +- textdomain( "pmount" ); ++ bindtextdomain(PACKAGE, NULL ); ++ textdomain(PACKAGE); /* are we root? */ if( geteuid() ) { +Index: pmount-0.9.18/src/luks.c +=================================================================== +--- pmount-0.9.18.orig/src/luks.c 2009-07-12 17:17:45.278704656 +0200 ++++ pmount-0.9.18/src/luks.c 2009-07-12 17:17:49.627119155 +0200 +@@ -14,7 +14,6 @@ + #include <stdio.h> + #include <limits.h> + #include <sys/stat.h> +-#include <libintl.h> + + enum decrypt_status + luks_decrypt( const char* device, char* decrypted, int decrypted_size, +Index: pmount-0.9.18/src/policy.c +=================================================================== +--- pmount-0.9.18.orig/src/policy.c 2009-07-12 17:17:55.502449663 +0200 ++++ pmount-0.9.18/src/policy.c 2009-07-12 17:18:03.200672861 +0200 +@@ -18,7 +18,6 @@ + #include <stdlib.h> + #include <errno.h> + #include <dirent.h> +-#include <libintl.h> + #include <sys/stat.h> + #include <sysfs/libsysfs.h> + #include <regex.h> +Index: pmount-0.9.18/src/realpath.c +=================================================================== +--- pmount-0.9.18.orig/src/realpath.c 2009-07-12 17:18:27.354526224 +0200 ++++ pmount-0.9.18/src/realpath.c 2009-07-12 17:18:32.256256916 +0200 +@@ -31,7 +31,6 @@ + #include <errno.h> + #include <stdio.h> + #include "realpath.h" +-#include <libintl.h> + #include "utils.h" + + #define MAX_READLINKS 32 +Index: pmount-0.9.18/src/utils.c +=================================================================== +--- pmount-0.9.18.orig/src/utils.c 2009-07-12 17:18:09.718277410 +0200 ++++ pmount-0.9.18/src/utils.c 2009-07-12 17:18:13.935179014 +0200 +@@ -21,7 +21,6 @@ + #include <unistd.h> + #include <fcntl.h> + #include <signal.h> +-#include <libintl.h> + + /* File name used to tag directories created by pmount */ + #define CREATED_DIR_STAMP ".created_by_pmount" diff --git a/recipes/pmount/pmount-0.9.19/gettext.patch b/recipes/pmount/pmount-0.9.19/gettext.patch new file mode 100644 index 0000000000..a784e32440 --- /dev/null +++ b/recipes/pmount/pmount-0.9.19/gettext.patch @@ -0,0 +1,197 @@ +Index: pmount-0.9.18/src/pmount-hal.c +=================================================================== +--- pmount-0.9.18.orig/src/pmount-hal.c 2008-10-09 23:19:46.000000000 +0200 ++++ pmount-0.9.18/src/pmount-hal.c 2009-07-12 17:16:00.719122863 +0200 +@@ -16,7 +16,6 @@ + #include <dirent.h> + #include <sys/stat.h> + #include <locale.h> +-#include <libintl.h> + #include <libhal-storage.h> + + #include "policy.h" +@@ -25,9 +24,6 @@ + + #include "realpath.h" + +-/* gettext abbreviation */ +-#define _(String) gettext(String) +- + void help() { + puts( _( + "pmount-hal - execute pmount with additional information from hal\n\n" +@@ -198,8 +194,8 @@ + + /* initialize locale */ + setlocale( LC_ALL, "" ); +- bindtextdomain( "pmount", NULL ); +- textdomain( "pmount" ); ++ bindtextdomain(PACKAGE, NULL ); ++ textdomain(PACKAGE); + + if( argc < 2 ) { + help(); +Index: pmount-0.9.18/src/utils.h +=================================================================== +--- pmount-0.9.18.orig/src/utils.h 2008-10-09 23:19:46.000000000 +0200 ++++ pmount-0.9.18/src/utils.h 2009-07-12 17:23:01.384780369 +0200 +@@ -12,8 +12,31 @@ + #define __utils_h + + /* gettext abbreviation */ ++#ifdef ENABLE_NLS ++ ++#include <libintl.h> ++ + #define _(String) gettext(String) + ++#ifdef gettext_noop ++#define N_(String) gettext_noop(String) ++#else ++#define N_(String) (String) ++#endif ++ ++#else /* NLS is disabled */ ++ ++#define _(String) (String) ++#define N_(String) (String) ++#define textdomain(String) (String) ++#d |