diff --git a/Makefile b/Makefile index e554a3096..ad018c88f 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ all: # Set and export the version string -export BR2_VERSION := 2014.11 +export BR2_VERSION := 2015.02-git # Check for minimal make version (note: this check will break at make 10.x) MIN_MAKE_VERSION = 3.81 diff --git a/board/boundarydevices/nitrogen6x/post-build.sh b/board/boundarydevices/nitrogen6x/post-build.sh index cc6e66acf..2b43aa322 100755 --- a/board/boundarydevices/nitrogen6x/post-build.sh +++ b/board/boundarydevices/nitrogen6x/post-build.sh @@ -8,11 +8,11 @@ BOARD_DIR="$(dirname $0)" # bd u-boot looks for bootscript here -cp $BOARD_DIR/6x_bootscript $TARGET_DIR +install -D -m 0644 $BOARD_DIR/6x_bootscript $TARGET_DIR/6x_bootscript # u-boot / update script for bd upgradeu command if [ -e $BINARIES_DIR/u-boot.imx ]; then - cp $BINARIES_DIR/u-boot.imx $TARGET_DIR - cp $BOARD_DIR/6x_upgrade $TARGET_DIR + install -D -m 0644 $BINARIES_DIR/u-boot.imx $TARGET_DIR/u-boot.imx + install -D -m 0644 $BOARD_DIR/6x_upgrade $TARGET_DIR/6x_upgrade fi diff --git a/board/ci20/readme.txt b/board/ci20/readme.txt new file mode 100644 index 000000000..ca7bb5291 --- /dev/null +++ b/board/ci20/readme.txt @@ -0,0 +1,42 @@ +********************* +* MIPS Creator CI20 * +********************* + +The 'ci20_defconfig' will create a root filesystem and a kernel image +under the 'output/images/' directory. This document will try to explain how +to use them in order to run Buildroot in the MIPS Creator CI20 board. + +Assuming you are at the U-Boot prompt of the MIPS Creator CI20, you have to +load the generated kernel image by using the 'tftpboot' command. In +order to do that, you will need to get the network working. Here you +have the instructions to set the ip address, netmask and gateway: + + setenv ipaddr x.x.x.x + setenv netmask x.x.x.x + setenv gatewayip x.x.x.x + +Now you have to set the ip for the TFTP server you are going to load the +kernel image from, and also the name of the kernel image file (we use +'uImage' as a filename in this example): + + setenv serverip x.x.x.x + setenv bootfile uImage + +And finally load the kernel image: + + tftpboot + +Now you have to extract the generated root filesystem into a USB drive +or SD-Card. Here you have the instructions to boot from the two of them. +You have to choose the one your prefer: + +From USB + setenv bootargs console=ttyS4,115200 console=tty0 mem=256M@0x0 +mem=768M@0x30000000 root=/dev/sda1 + +From SD-Card + setenv bootargs console=ttyS4,115200 console=tty0 mem=256M@0x0 +mem=768M@0x30000000 root=/dev/mmcblk0p1 + +And finally run this command to boot the board: + bootm diff --git a/board/freescale/p1010rdb/linux-3.13.config b/board/freescale/p1010rdb/linux-3.17.config similarity index 97% rename from board/freescale/p1010rdb/linux-3.13.config rename to board/freescale/p1010rdb/linux-3.17.config index b91d31255..c48c4fb5d 100644 --- a/board/freescale/p1010rdb/linux-3.13.config +++ b/board/freescale/p1010rdb/linux-3.17.config @@ -57,11 +57,9 @@ CONFIG_MTD_CFI=y CONFIG_MTD_CFI_INTELEXT=y CONFIG_MTD_CFI_AMDSTD=y CONFIG_MTD_PHYSMAP_OF=y -CONFIG_MTD_M25P80=y CONFIG_MTD_NAND=y CONFIG_MTD_NAND_FSL_ELBC=y CONFIG_MTD_NAND_FSL_IFC=y -CONFIG_PROC_DEVICETREE=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_NBD=y CONFIG_BLK_DEV_RAM=y @@ -71,7 +69,6 @@ CONFIG_BLK_DEV_SD=y CONFIG_CHR_DEV_ST=y CONFIG_BLK_DEV_SR=y CONFIG_CHR_DEV_SG=y -CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_LOGGING=y CONFIG_ATA=y CONFIG_SATA_FSL=y diff --git a/board/freescale/p1010rdb/readme.txt b/board/freescale/p1010rdb/readme.txt index b73ef4d53..b119f9a47 100644 --- a/board/freescale/p1010rdb/readme.txt +++ b/board/freescale/p1010rdb/readme.txt @@ -45,7 +45,7 @@ your newly built U-Boot. 2. Program the DTB to NOR flash - => tftp $loadaddr p1010rdb.dtb + => tftp $loadaddr p1010rdb-pa.dtb => erase 0xee000000 +$filesize => cp.b $loadaddr 0xee000000 $filesize diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk index 535ada637..ae687d6b1 100644 --- a/boot/grub/grub.mk +++ b/boot/grub/grub.mk @@ -81,7 +81,7 @@ GRUB_CONF_OPTS = \ ifeq ($(BR2_TARGET_GRUB_SPLASH),y) define GRUB_INSTALL_SPLASH - cp boot/grub/splash.xpm.gz $(TARGET_DIR)/boot/grub/ + $(INSTALL) -D -m 0644 boot/grub/splash.xpm.gz $(TARGET_DIR)/boot/grub/splash.xpm.gz endef else define GRUB_INSTALL_SPLASH @@ -95,14 +95,14 @@ endif # of a disk or disk image. define GRUB_INSTALL_TARGET_CMDS - install -m 0755 -D $(@D)/grub/grub $(HOST_DIR)/sbin/grub - mkdir -p $(TARGET_DIR)/boot/grub - cp $(@D)/stage1/stage1 $(TARGET_DIR)/boot/grub + $(INSTALL) -D -m 0755 $(@D)/grub/grub $(HOST_DIR)/sbin/grub + $(INSTALL) -D -m 0755 $(@D)/stage1/stage1 $(TARGET_DIR)/boot/grub/stage1 for f in $(GRUB_STAGE_1_5_TO_INSTALL) ; do \ - cp $(@D)/stage2/$${f}_stage1_5 $(TARGET_DIR)/boot/grub ; \ + $(INSTALL) -D -m 0755 $(@D)/stage2/$${f}_stage1_5 \ + $(TARGET_DIR)/boot/grub/$${f}_stage1_5 ; \ done - cp $(@D)/stage2/stage2 $(TARGET_DIR)/boot/grub - cp boot/grub/menu.lst $(TARGET_DIR)/boot/grub + $(INSTALL) -D -m 0644 $(@D)/stage2/stage2 $(TARGET_DIR)/boot/grub/stage2 + $(INSTALL) -D -m 0644 boot/grub/menu.lst $(TARGET_DIR)/boot/grub/menu.lst $(GRUB_INSTALL_SPLASH) endef diff --git a/configs/ci20_defconfig b/configs/ci20_defconfig new file mode 100644 index 000000000..7f1bf878b --- /dev/null +++ b/configs/ci20_defconfig @@ -0,0 +1,18 @@ +# architecture +BR2_mipsel=y +BR2_mips_32r2=y +# BR2_MIPS_SOFT_FLOAT is not set + +# system +BR2_KERNEL_HEADERS_VERSION=y +BR2_DEFAULT_KERNEL_VERSION="3.0.8" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_0=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS4" + +# kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/MIPS/CI20_linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ba11adc7ac8792b0eb7415a1cc9c0968604a6fac" +BR2_LINUX_KERNEL_DEFCONFIG="ci20" diff --git a/configs/freescale_p1010rdb_pa_defconfig b/configs/freescale_p1010rdb_pa_defconfig index d3e053815..b784f393a 100644 --- a/configs/freescale_p1010rdb_pa_defconfig +++ b/configs/freescale_p1010rdb_pa_defconfig @@ -11,18 +11,18 @@ BR2_TARGET_ROOTFS_JFFS2_CUSTOM_EBSIZE=0x20000 # Lock headers version to match and avoid breakage BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.13.6" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_13=y +BR2_DEFAULT_KERNEL_VERSION="3.17.4" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_17=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.17.4" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/p1010rdb/linux-3.13.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/p1010rdb/linux-3.17.config" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="p1010rdb" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="p1010rdb-pa" # Serial port config BR2_TARGET_GENERIC_GETTY=y diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk index 908f0e981..5b44ba424 100644 --- a/fs/iso9660/iso9660.mk +++ b/fs/iso9660/iso9660.mk @@ -14,20 +14,22 @@ ROOTFS_ISO9660_DEPENDENCIES = grub host-cdrkit host-fakeroot linux rootfs-cpio $(BINARIES_DIR)/rootfs.iso9660: $(ROOTFS_ISO9660_DEPENDENCIES) @$(call MESSAGE,"Generating root filesystem image rootfs.iso9660") - mkdir -p $(ISO9660_TARGET_DIR) - mkdir -p $(ISO9660_TARGET_DIR)/boot/grub - cp $(GRUB_DIR)/stage2/stage2_eltorito $(ISO9660_TARGET_DIR)/boot/grub/ - cp $(ISO9660_BOOT_MENU) $(ISO9660_TARGET_DIR)/boot/grub/menu.lst + $(INSTALL) -D -m 0644 $(GRUB_DIR)/stage2/stage2_eltorito \ + $(ISO9660_TARGET_DIR)/boot/grub/stage2_eltorito + $(INSTALL) -D -m 0644 $(ISO9660_BOOT_MENU) \ + $(ISO9660_TARGET_DIR)/boot/grub/menu.lst ifeq ($(BR2_TARGET_GRUB_SPLASH),) $(SED) '/^splashimage/d' $(ISO9660_TARGET_DIR)/boot/grub/menu.lst else - cp boot/grub/splash.xpm.gz $(ISO9660_TARGET_DIR)/ + $(INSTALL) -D -m 0644 boot/grub/splash.xpm.gz \ + $(ISO9660_TARGET_DIR)/splash.xpm.gz endif - cp $(LINUX_IMAGE_PATH) $(ISO9660_TARGET_DIR)/kernel + $(INSTALL) -D -m 0644 $(LINUX_IMAGE_PATH) $(ISO9660_TARGET_DIR)/kernel ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y) $(SED) '/initrd/d' $(ISO9660_TARGET_DIR)/boot/grub/menu.lst else - cp $(BINARIES_DIR)/rootfs.cpio$(ROOTFS_CPIO_COMPRESS_EXT) $(ISO9660_TARGET_DIR)/initrd + $(INSTALL) -D -m 0644 $(BINARIES_DIR)/rootfs.cpio$(ROOTFS_CPIO_COMPRESS_EXT) \ + $(ISO9660_TARGET_DIR)/initrd endif # Use fakeroot to pretend all target binaries are owned by root rm -f $(FAKEROOT_SCRIPT) diff --git a/package/Config.in b/package/Config.in index 28cf70323..b8fc7d15a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -76,6 +76,7 @@ endif source "package/lttng-babeltrace/Config.in" source "package/lttng-modules/Config.in" source "package/lttng-tools/Config.in" + source "package/mcelog/Config.in" source "package/memstat/Config.in" source "package/netperf/Config.in" source "package/oprofile/Config.in" @@ -391,6 +392,7 @@ endmenu menu "Interpreter languages and scripting" source "package/enscript/Config.in" source "package/erlang/Config.in" + source "package/guile/Config.in" source "package/haserl/Config.in" source "package/jamvm/Config.in" source "package/jimtcl/Config.in" @@ -482,6 +484,7 @@ endif if BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 menu "external python modules" source "package/python-bottle/Config.in" + source "package/python-certifi/Config.in" source "package/python-cffi/Config.in" source "package/python-configobj/Config.in" source "package/python-configshell-fb/Config.in" @@ -489,17 +492,23 @@ menu "external python modules" source "package/python-daemon/Config.in" source "package/python-dialog/Config.in" source "package/python-dpkt/Config.in" + source "package/python-flask/Config.in" source "package/python-flup/Config.in" + source "package/python-httplib2/Config.in" source "package/python-id3/Config.in" source "package/python-ipy/Config.in" source "package/python-ipython/Config.in" + source "package/python-itsdangerous/Config.in" + source "package/python-jinja2/Config.in" source "package/python-json-schema-validator/Config.in" source "package/python-keyring/Config.in" source "package/python-libconfig/Config.in" source "package/python-mad/Config.in" + source "package/python-markupsafe/Config.in" source "package/python-meld3/Config.in" source "package/python-msgpack/Config.in" source "package/python-netifaces/Config.in" + source "package/python-networkmanager/Config.in" source "package/python-nfc/Config.in" source "package/python-numpy/Config.in" source "package/python-posix-ipc/Config.in" @@ -515,6 +524,7 @@ menu "external python modules" source "package/python-pysnmp-mibs/Config.in" source "package/python-pyusb/Config.in" source "package/python-pyzmq/Config.in" + source "package/python-requests/Config.in" source "package/python-rtslib-fb/Config.in" source "package/python-serial/Config.in" source "package/python-setuptools/Config.in" @@ -523,6 +533,8 @@ menu "external python modules" source "package/python-tornado/Config.in" source "package/python-urwid/Config.in" source "package/python-versiontools/Config.in" + source "package/python-webpy/Config.in" + source "package/python-werkzeug/Config.in" endmenu endif source "package/ruby/Config.in" @@ -625,6 +637,7 @@ menu "Graphics" source "package/adwaita-icon-theme/Config.in" source "package/atk/Config.in" source "package/cairo/Config.in" + source "package/exiv2/Config.in" source "package/fltk/Config.in" source "package/fontconfig/Config.in" source "package/freetype/Config.in" @@ -824,6 +837,7 @@ menu "Networking" source "package/libtorrent/Config.in" source "package/libupnp/Config.in" source "package/libupnpp/Config.in" + source "package/liburiparser/Config.in" source "package/libvncserver/Config.in" source "package/libwebsockets/Config.in" source "package/neon/Config.in" @@ -848,6 +862,7 @@ menu "Other" source "package/apr-util/Config.in" source "package/argp-standalone/Config.in" source "package/armadillo/Config.in" + source "package/bdwgc/Config.in" source "package/boost/Config.in" source "package/clapack/Config.in" source "package/classpath/Config.in" @@ -1197,6 +1212,7 @@ endif source "package/cpuload/Config.in" if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/dcron/Config.in" + source "package/debianutils/Config.in" endif source "package/dsp-tools/Config.in" source "package/ftop/Config.in" diff --git a/package/bdwgc/Config.in b/package/bdwgc/Config.in new file mode 100644 index 000000000..9aa7c7dff --- /dev/null +++ b/package/bdwgc/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_BDWGC + bool "bdwgc" + depends on BR2_PACKAGE_LIBATOMIC_ARCH_SUPPORTS + select BR2_PACKAGE_LIBATOMIC_OPS + help + The Boehm-Demers-Weiser conservative garbage collector can + be used as a garbage collecting replacement for C 'malloc' + or C++ 'new'. + + http://www.hboehm.info/gc/ diff --git a/package/bdwgc/bdwgc.mk b/package/bdwgc/bdwgc.mk new file mode 100644 index 000000000..3e6de1ac9 --- /dev/null +++ b/package/bdwgc/bdwgc.mk @@ -0,0 +1,26 @@ +################################################################################ +# +# bdwgc +# +################################################################################ + +BDWGC_VERSION = 7.2f +BDWGC_SOURCE = gc-$(BDWGC_VERSION).tar.gz +BDWGC_SITE = http://www.hboehm.info/gc/gc_source +BDWGC_INSTALL_STAGING = YES +BDWGC_LICENSE = bdwgc license +BDWGC_LICENSE_FILES = README.QUICK +BDWGC_DEPENDENCIES = libatomic_ops host-pkgconf + +# The libtool shipped with the package is bogus and generates some +# -L/usr/lib flags. It uses a version not supported by Buildroot +# libtool patches, so autoreconfiguring the packages is the easiest +# solution. +BDWGC_AUTORECONF = YES + +# Ensure we use the system libatomic_ops, and not the internal one. +BDWGC_CONF_OPTS = --with-libatomic-ops=yes +HOST_BDWGC_CONF_OPTS = --with-libatomic-ops=yes + +$(eval $(autotools-package)) +$(eval $(host-autotools-package)) diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash index 0f207b254..f030c176e 100644 --- a/package/btrfs-progs/btrfs-progs.hash +++ b/package/btrfs-progs/btrfs-progs.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc -sha256 6c01579c7b858c175aaed6b3b087dadaa38efb8e590a6928f1afe86bb8faaaab btrfs-progs-v3.17.1.tar.xz +sha256 50ecc724a41a6ec9e37a0fbb134d336bdafd7fa24ec69de0c591c211da4456c6 btrfs-progs-v3.17.2.tar.xz diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 7122df1b0..b13f227f3 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -4,7 +4,7 @@ # ################################################################################ -BTRFS_PROGS_VERSION = 3.17.1 +BTRFS_PROGS_VERSION = 3.17.2 BTRFS_PROGS_SITE = https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = acl attr e2fsprogs lzo util-linux zlib diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 0ceaab17f..f0fa85199 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -50,8 +50,8 @@ BUSYBOX_KCONFIG_EDITORS = menuconfig xconfig gconfig BUSYBOX_KCONFIG_OPTS = $(BUSYBOX_MAKE_OPTS) define BUSYBOX_PERMISSIONS - /bin/busybox f 4755 0 0 - - - - - - /usr/share/udhcpc/default.script f 755 0 0 - - - - - + /bin/busybox f 4755 0 0 - - - - - + /usr/share/udhcpc/default.script f 755 0 0 - - - - - endef # If mdev will be used for device creation enable it and copy S10mdev to /etc/init.d diff --git a/package/dbus-python/Config.in b/package/dbus-python/Config.in index a38d27794..332726348 100644 --- a/package/dbus-python/Config.in +++ b/package/dbus-python/Config.in @@ -3,15 +3,16 @@ config BR2_PACKAGE_DBUS_PYTHON depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 depends on BR2_PACKAGE_DBUS - depends on BR2_PACKAGE_PYTHON + depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_DBUS_GLIB # pyexpat: runtime dependency only - select BR2_PACKAGE_PYTHON_PYEXPAT + select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON + select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 help Python bindings for D-Bus http://dbus.freedesktop.org/doc/dbus-python/ comment "dbus-python needs a toolchain w/ wchar, threads" - depends on BR2_PACKAGE_DBUS && BR2_PACKAGE_PYTHON + depends on BR2_PACKAGE_DBUS && (BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3) depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/dbus-python/dbus-python-0001-fix-python-configure-check.patch b/package/dbus-python/dbus-python-0001-fix-python-configure-check.patch deleted file mode 100644 index 2df4da888..000000000 --- a/package/dbus-python/dbus-python-0001-fix-python-configure-check.patch +++ /dev/null @@ -1,27 +0,0 @@ -Python: add am_cv_python_includes to override runtime python-config check -[Gustavo: update for dbus-python 1.2.0] - -diff -Nura dbus-python-1.2.0.orig/configure dbus-python-1.2.0/configure ---- dbus-python-1.2.0.orig/configure 2013-05-08 04:48:42.000000000 -0300 -+++ dbus-python-1.2.0/configure 2014-07-03 16:54:25.922727033 -0300 -@@ -11762,6 +11762,12 @@ - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python headers using $PYTHON-config --includes" >&5 - $as_echo_n "checking for Python headers using $PYTHON-config --includes... " >&6; } -+if test "${am_cv_python_includes+set}" = set; then -+ $as_echo_n "(cached) $ECHO_C" >&6 -+ PYTHON_INCLUDES=${am_cv_python_includes} -+ { $as_echo "$as_me:$LINENO: result: $PYTHON_INCLUDES" >&5 -+$as_echo_t "${ECHO_T}$PYTHON_INCLUDES" >&6; } -+else - PYTHON_INCLUDES=`$PYTHON-config --includes` - if test $? = 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_INCLUDES" >&5 -@@ -11781,6 +11787,7 @@ - $as_echo "$PYTHON_INCLUDES" >&6; } - fi - fi -+fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether those headers are sufficient" >&5 - $as_echo_n "checking whether those headers are sufficient... " >&6; } diff --git a/package/dbus-python/dbus-python.mk b/package/dbus-python/dbus-python.mk index d4fdfa1ea..1637406c0 100644 --- a/package/dbus-python/dbus-python.mk +++ b/package/dbus-python/dbus-python.mk @@ -9,17 +9,25 @@ DBUS_PYTHON_SITE = http://dbus.freedesktop.org/releases/dbus-python DBUS_PYTHON_INSTALL_STAGING = YES DBUS_PYTHON_LICENSE = MIT DBUS_PYTHON_LICENSE_FILES = COPYING - -DBUS_PYTHON_CONF_ENV = am_cv_pathless_PYTHON=python \ - ac_cv_path_PYTHON=$(HOST_DIR)/usr/bin/python \ - am_cv_python_version=$(PYTHON_VERSION) \ - am_cv_python_platform=linux2 \ - am_cv_python_pythondir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \ - am_cv_python_pyexecdir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \ - am_cv_python_includes=-I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) - +DBUS_PYTHON_DEPENDENCIES = dbus-glib DBUS_PYTHON_CONF_OPTS = --disable-html-docs --disable-api-docs -DBUS_PYTHON_DEPENDENCIES = dbus-glib python host-python +ifeq ($(BR2_PACKAGE_PYTHON),y) +DBUS_PYTHON_DEPENDENCIES += python host-python + +DBUS_PYTHON_CONF_ENV += \ + PYTHON=$(HOST_DIR)/usr/bin/python2 \ + PYTHON_INCLUDES="$(shell $(STAGING_DIR)/usr/bin/python2-config --includes)" \ + PYTHON_LIBS="$(shell $(STAGING_DIR)/usr/bin/python2-config --ldflags)" +else +DBUS_PYTHON_DEPENDENCIES += python3 host-python3 + +DBUS_PYTHON_CONF_ENV += \ + PYTHON=$(HOST_DIR)/usr/bin/python3 \ + PYTHON_INCLUDES="$(shell $(STAGING_DIR)/usr/bin/python3-config --includes)" \ + PYTHON_LIBS="$(shell $(STAGING_DIR)/usr/bin/python3-config --ldflags)" +endif + + $(eval $(autotools-package)) diff --git a/package/debianutils/Config.in b/package/debianutils/Config.in new file mode 100644 index 000000000..f86586870 --- /dev/null +++ b/package/debianutils/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_DEBIANUTILS + bool "debianutils" + depends on BR2_USE_MMU # fork() + help + Miscellaneous utilities specific to Debian. + + https://tracker.debian.org/pkg/debianutils diff --git a/package/debianutils/debianutils.hash b/package/debianutils/debianutils.hash new file mode 100644 index 000000000..089dd425f --- /dev/null +++ b/package/debianutils/debianutils.hash @@ -0,0 +1,2 @@ +# From http://ftp.de.debian.org/debian/pool/main/d/debianutils/debianutils_4.4.dsc +sha256 190850cdd6b5302e0a1ba1aaed1bc7074d67d3bd8d04c613f242f7145afa53a6 debianutils_4.4.tar.gz diff --git a/package/debianutils/debianutils.mk b/package/debianutils/debianutils.mk new file mode 100644 index 000000000..dd7877423 --- /dev/null +++ b/package/debianutils/debianutils.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# debianutils +# +################################################################################ + +DEBIANUTILS_VERSION = 4.4 +DEBIANUTILS_SOURCE = debianutils_$(DEBIANUTILS_VERSION).tar.gz +DEBIANUTILS_SITE = http://snapshot.debian.org/archive/debian/20130728T034252Z/pool/main/d/debianutils +DEBIANUTILS_CONF_OPTS = --exec-prefix=/ +# Make sure we override the busybox tools, such as which +DEBIANUTILS_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox) +DEBIANUTILS_LICENSE = GPLv2+, SMAIL (savelog) +DEBIANUTILS_LICENSE_FILES = debian/copyright + +$(eval $(autotools-package)) diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk index 27fb60b74..1eb6b3254 100644 --- a/package/dhcp/dhcp.mk +++ b/package/dhcp/dhcp.mk @@ -59,7 +59,7 @@ define DHCP_INSTALL_CLIENT mkdir -p $(TARGET_DIR)/var/lib (cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp) $(INSTALL) -m 0755 -D $(DHCP_DIR)/client/dhclient \ - $(TARGET_DIR)/usr/sbin/dhclient + $(TARGET_DIR)/sbin/dhclient $(INSTALL) -m 0644 -D package/dhcp/dhclient.conf \ $(TARGET_DIR)/etc/dhcp/dhclient.conf $(INSTALL) -m 0755 -D package/dhcp/dhclient-script \ diff --git a/package/dhcpcd/dhcpcd.hash b/package/dhcpcd/dhcpcd.hash new file mode 100644 index 000000000..851849ba7 --- /dev/null +++ b/package/dhcpcd/dhcpcd.hash @@ -0,0 +1,2 @@ +# Locally calculated from download (no sig, hash) +sha256 67ba7cfe96089150da8e12badbcc5853daefce39417364887984948bad0a37d0 dhcpcd-6.6.4.tar.bz2 diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk index 3bb7a135f..dc663a808 100644 --- a/package/dhcpcd/dhcpcd.mk +++ b/package/dhcpcd/dhcpcd.mk @@ -4,7 +4,7 @@ # ################################################################################ -DHCPCD_VERSION = 6.4.7 +DHCPCD_VERSION = 6.6.4 DHCPCD_SOURCE = dhcpcd-$(DHCPCD_VERSION).tar.bz2 DHCPCD_SITE = http://roy.marples.name/downloads/dhcpcd DHCPCD_DEPENDENCIES = host-pkgconf @@ -35,12 +35,7 @@ define DHCPCD_BUILD_CMDS endef define DHCPCD_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/dhcpcd \ - $(TARGET_DIR)/usr/sbin/dhcpcd - $(INSTALL) -D -m 0644 $(@D)/dhcpcd.conf \ - $(TARGET_DIR)/etc/dhcpcd.conf - $(INSTALL) -D -m 0755 $(@D)/dhcpcd-run-hooks \ - $(TARGET_DIR)/libexec/dhcpcd-run-hooks + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install DESTDIR=$(TARGET_DIR) endef # NOTE: Even though this package has a configure script, it is not generated diff --git a/package/elfutils/elfutils-01-disable-progs.patch b/package/elfutils/0001-disable-progs.patch similarity index 62% rename from package/elfutils/elfutils-01-disable-progs.patch rename to package/elfutils/0001-disable-progs.patch index 462de89e3..8772f5ed3 100644 --- a/package/elfutils/elfutils-01-disable-progs.patch +++ b/package/elfutils/0001-disable-progs.patch @@ -7,35 +7,18 @@ useful because the programs are often not needed, and also because building the programs against uClibc causes several issues (lack of obstack_printf() in uClibc for example). -Signed-off-by: Thomas Petazzoni +Based on the former patch by Thomas Petazzoni. -Index: b/Makefile.am -=================================================================== ---- a/Makefile.am -+++ b/Makefile.am -@@ -22,9 +22,13 @@ - - pkginclude_HEADERS = version.h - -+if ENABLE_PROGS -+PROGS_SUBDIR = src -+endif -+ - # Add doc back when we have some real content. - SUBDIRS = config m4 lib libelf libebl libdwfl libdw libcpu libasm backends \ -- src po tests -+ $(PROGS_SUBDIR) po tests - - EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \ - COPYING COPYING-GPLV2 COPYING-LGPLV3 -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -263,6 +263,12 @@ +Signed-off-by: Thomas Petazzoni +Signed-off-by: Vicente Olivert Riera + +diff -rup a/configure.ac b/configure.ac +--- a/configure.ac 2014-11-07 14:54:32.859360779 +0000 ++++ b/configure.ac 2014-11-07 14:47:44.847376394 +0000 +@@ -253,6 +253,12 @@ AC_SUBST([LIBEBL_SUBDIR]) AC_DEFINE_UNQUOTED(LIBEBL_SUBDIR, "$LIBEBL_SUBDIR") AH_TEMPLATE([LIBEBL_SUBDIR], [$libdir subdirectory containing libebl modules.]) - + +AC_ARG_ENABLE([progs], + AS_HELP_STRING([--enable-progs], [enable progs]), + enable_progs=$enableval, @@ -45,3 +28,21 @@ Index: b/configure.ac dnl Test for zlib and bzlib, gives ZLIB/BZLIB .am dnl conditional and config.h USE_ZLIB/USE_BZLIB #define. save_LIBS="$LIBS" +diff -rup a/Makefile.am b/Makefile.am +--- a/Makefile.am 2014-08-27 10:25:17.000000000 +0100 ++++ b/Makefile.am 2014-11-07 14:51:38.081368550 +0000 +@@ -22,9 +22,13 @@ ACLOCAL_AMFLAGS = -I m4 + + pkginclude_HEADERS = version.h + ++if ENABLE_PROGS ++PROGS_SUBDIR = src ++endif ++ + # Add doc back when we have some real content. + SUBDIRS = config m4 lib libelf libebl libdwelf libdwfl libdw libcpu libasm \ +- backends src po tests ++ backends $(PROGS_SUBDIR) po tests + + EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \ + COPYING COPYING-GPLV2 COPYING-LGPLV3 diff --git a/package/elfutils/0002-argp-support.patch b/package/elfutils/0002-argp-support.patch new file mode 100644 index 000000000..c94d26296 --- /dev/null +++ b/package/elfutils/0002-argp-support.patch @@ -0,0 +1,93 @@ +Allow the usage of an external implementation of the argp functions + +uClibc lack the argp family of functions that glibc has. Therefore, we +add a check in the configure script to see if argp_parse is available +in the C library. If not, we look if it is available in the additional +'argp' library. If so, we link against that library. If not, we error +out. + +This allows to build elfutils against uClibc with an external argp +library. + +Based on the former patch by Thomas Petazzoni. + +Signed-off-by: Thomas Petazzoni +Signed-off-by: Vicente Olivert Riera + +diff -rup a/configure.ac b/configure.ac +--- a/configure.ac 2014-11-07 15:00:38.663627402 +0000 ++++ b/configure.ac 2014-11-07 15:02:30.233539737 +0000 +@@ -259,6 +259,13 @@ AC_ARG_ENABLE([progs], + enable_progs=yes) + AM_CONDITIONAL(ENABLE_PROGS, test "$enable_progs" = yes) + ++AC_CHECK_FUNC([argp_parse]) ++if test "$ac_cv_func_argp_parse" != yes; then ++ AC_CHECK_LIB([argp],[argp_parse],ARGP_LIBS=-largp, ++ AC_MSG_ERROR([No argp_parse function available.])) ++fi ++AC_SUBST(ARGP_LIBS) ++ + dnl Test for zlib and bzlib, gives ZLIB/BZLIB .am + dnl conditional and config.h USE_ZLIB/USE_BZLIB #define. + save_LIBS="$LIBS" +diff -rup a/libdw/Makefile.am b/libdw/Makefile.am +--- a/libdw/Makefile.am 2014-08-27 10:25:17.000000000 +0100 ++++ b/libdw/Makefile.am 2014-11-07 15:09:32.804794962 +0000 +@@ -110,7 +110,7 @@ libdw.so$(EXEEXT): $(srcdir)/libdw.map l + -Wl,--enable-new-dtags,-rpath,$(pkglibdir) \ + -Wl,--version-script,$<,--no-undefined \ + -Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\ +- -ldl $(zip_LIBS) ++ -ldl $(zip_LIBS) $(ARGP_LIBS) + if $(READELF) -d $@ | fgrep -q TEXTREL; then exit 1; fi + ln -fs $@ $@.$(VERSION) + +diff -rup a/src/Makefile.am b/src/Makefile.am +--- a/src/Makefile.am 2014-11-07 15:00:35.867579484 +0000 ++++ b/src/Makefile.am 2014-11-07 15:08:47.380013980 +0000 +@@ -94,27 +94,29 @@ readelf_no_Werror = yes + strings_no_Werror = yes + addr2line_no_Wformat = yes + +-readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl ++readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl $(ARGP_LIBS) + nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl \ +- $(demanglelib) +-size_LDADD = $(libelf) $(libeu) +-strip_LDADD = $(libebl) $(libelf) $(libeu) -ldl +-ld_LDADD = $(libebl) $(libelf) $(libeu) -ldl ++ $(demanglelib) $(ARGP_LIBS) ++size_LDADD = $(libelf) $(libeu) $(ARGP_LIBS) ++strip_LDADD = $(libebl) $(libelf) $(libeu) -ldl $(ARGP_LIBS) ++ld_LDADD = $(libebl) $(libelf) $(libeu) -ldl $(ARGP_LIBS) + if NATIVE_LD + # -ldl is always needed for libebl. + ld_LDADD += libld_elf.a + endif + ld_LDFLAGS = -rdynamic +-elflint_LDADD = $(libebl) $(libelf) $(libeu) -ldl +-findtextrel_LDADD = $(libdw) $(libelf) +-addr2line_LDADD = $(libdw) $(libelf) +-elfcmp_LDADD = $(libebl) $(libelf) -ldl +-objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) -ldl +-ranlib_LDADD = libar.a $(libelf) $(libeu) +-strings_LDADD = $(libelf) $(libeu) +-ar_LDADD = libar.a $(libelf) $(libeu) +-unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) -ldl +-stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) -ldl $(demanglelib) ++elflint_LDADD = $(libebl) $(libelf) $(libeu) -ldl $(ARGP_LIBS) ++findtextrel_LDADD = $(libdw) $(libelf) $(ARGP_LIBS) ++addr2line_LDADD = $(libdw) $(libelf) $(ARGP_LIBS) ++elfcmp_LDADD = $(libebl) $(libelf) -ldl $(ARGP_LIBS) ++objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) -ldl \ ++ $(ARGP_LIBS) ++ranlib_LDADD = libar.a $(libelf) $(libeu) $(ARGP_LIBS) ++strings_LDADD = $(libelf) $(libeu) $(ARGP_LIBS) ++ar_LDADD = libar.a $(libelf) $(libeu) $(ARGP_LIBS) ++unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) -ldl $(ARGP_LIBS) ++stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) -ldl \ ++ $(demanglelib) $(ARGP_LIBS) + + ldlex.o: ldscript.c + ldlex_no_Werror = yes diff --git a/package/elfutils/elfutils-03-memcpy-def.patch b/package/elfutils/0003-memcpy-def.patch similarity index 62% rename from package/elfutils/elfutils-03-memcpy-def.patch rename to package/elfutils/0003-memcpy-def.patch index eb50cf654..509482774 100644 --- a/package/elfutils/elfutils-03-memcpy-def.patch +++ b/package/elfutils/0003-memcpy-def.patch @@ -4,21 +4,23 @@ For some reason, libelf uses the internal glibc alias __memcpy, which doesn't exist in uClibc. Add a manual alias so that the build can proceed with uClibc. -Signed-off-by: Thomas Petazzoni +Based on the former patch by Thomas Petazzoni. -Index: b/libelf/libelf.h -=================================================================== ---- a/libelf/libelf.h -+++ b/libelf/libelf.h +Signed-off-by: Thomas Petazzoni +Signed-off-by: Vicente Olivert Riera + +diff -rup a/libelf/libelf.h b/libelf/libelf.h +--- a/libelf/libelf.h 2014-08-27 10:25:17.000000000 +0100 ++++ b/libelf/libelf.h 2014-11-07 15:13:08.743508221 +0000 @@ -34,6 +34,11 @@ /* Get the ELF types. */ #include - + +#ifndef _LIBC +#ifndef __mempcpy +#define __mempcpy mempcpy +#endif +#endif - + /* Known translation types. */ typedef enum diff --git a/package/elfutils/elfutils-04-fts.patch b/package/elfutils/0004-fts.patch similarity index 97% rename from package/elfutils/elfutils-04-fts.patch rename to package/elfutils/0004-fts.patch index 7318236d2..fd7c0b22f 100644 --- a/package/elfutils/elfutils-04-fts.patch +++ b/package/elfutils/0004-fts.patch @@ -22,16 +22,18 @@ So we have several options here: Of course, the fts_*() functions are only built if they are not already provided by the C library. -Signed-off-by: Thomas Petazzoni +Based on the former patch by Thomas Petazzoni. -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -276,6 +276,10 @@ +Signed-off-by: Thomas Petazzoni +Signed-off-by: Vicente Olivert Riera + +diff -Nrup a/configure.ac b/configure.ac +--- a/configure.ac 2014-11-07 15:14:42.402119092 +0000 ++++ b/configure.ac 2014-11-07 15:16:50.161316781 +0000 +@@ -266,6 +266,10 @@ if test "$ac_cv_func_argp_parse" != yes; fi AC_SUBST(ARGP_LIBS) - + +AC_CHECK_HEADER([fts.h], + AC_DEFINE([HAVE_FTS_H], [], [Define if is available in C library])) +AM_CONDITIONAL(HAVE_FTS, test "$ac_cv_header_fts_h" = yes) @@ -39,24 +41,9 @@ Index: b/configure.ac dnl Test for zlib and bzlib, gives ZLIB/BZLIB .am dnl conditional and config.h USE_ZLIB/USE_BZLIB #define. save_LIBS="$LIBS" -Index: b/libdwfl/Makefile.am -=================================================================== ---- a/libdwfl/Makefile.am -+++ b/libdwfl/Makefile.am -@@ -79,6 +79,9 @@ - if LZMA - libdwfl_a_SOURCES += lzma.c - endif -+if !HAVE_FTS -+libdwfl_a_SOURCES += fts.c -+endif - - if MUDFLAP - libdwfl = libdwfl.a $(libdw) $(libebl) $(libelf) $(libeu) -Index: b/libdwfl/fts.c -=================================================================== ---- /dev/null -+++ b/libdwfl/fts.c +diff -Nrup a/libdwfl/fts.c b/libdwfl/fts.c +--- a/libdwfl/fts.c 1970-01-01 01:00:00.000000000 +0100 ++++ b/libdwfl/fts.c 2014-11-07 15:25:08.325879956 +0000 @@ -0,0 +1,1095 @@ +/*- + * Copyright (c) 1990, 1993, 1994 @@ -1153,10 +1140,9 @@ Index: b/libdwfl/fts.c + errno = oerrno; + return (ret); +} -Index: b/libdwfl/fts_.h -=================================================================== ---- /dev/null -+++ b/libdwfl/fts_.h +diff -Nrup a/libdwfl/fts_.h b/libdwfl/fts_.h +--- a/libdwfl/fts_.h 1970-01-01 01:00:00.000000000 +0100 ++++ b/libdwfl/fts_.h 2014-11-07 15:26:00.806777392 +0000 @@ -0,0 +1,131 @@ +/* + * Copyright (c) 1989, 1993 @@ -1289,19 +1275,31 @@ Index: b/libdwfl/fts_.h +__END_DECLS + +#endif /* fts.h */ -Index: b/libdwfl/linux-kernel-modules.c -=================================================================== ---- a/libdwfl/linux-kernel-modules.c -+++ b/libdwfl/linux-kernel-modules.c +diff -Nrup a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c +--- a/libdwfl/linux-kernel-modules.c 2014-08-27 10:25:17.000000000 +0100 ++++ b/libdwfl/linux-kernel-modules.c 2014-11-07 15:27:10.783974209 +0000 @@ -29,7 +29,11 @@ /* We include this before config.h because it can't handle _FILE_OFFSET_BITS. Everything we need here is fine if its declarations just come first. */ - + +#ifdef HAVE_FTS_H #include +#else +#include "fts_.h" +#endif - + #include - + +diff -Nrup a/libdwfl/Makefile.am b/libdwfl/Makefile.am +--- a/libdwfl/Makefile.am 2014-08-27 10:25:17.000000000 +0100 ++++ b/libdwfl/Makefile.am 2014-11-07 15:17:57.682478408 +0000 +@@ -79,6 +79,9 @@ endif + if LZMA + libdwfl_a_SOURCES += lzma.c + endif ++if !HAVE_FTS ++libdwfl_a_SOURCES += fts.c ++endif + + libdwfl = $(libdw) + libdw = ../libdw/libdw.so diff --git a/package/elfutils/0005-disable-po.patch b/package/elfutils/0005-disable-po.patch new file mode 100644 index 000000000..c45c58046 --- /dev/null +++ b/package/elfutils/0005-disable-po.patch @@ -0,0 +1,24 @@ +Disable the build of the po/ directory + +Building the po/ directory complains that the scripts in there have +been generated with gettext 0.17, while we use gettext 0.18 in +Buildroot. Since we don't care that much about po files anyway, just +disable the build of this directory. + +Based on the former patch by Thomas Petazzoni. + +Signed-off-by: Thomas Petazzoni +Signed-off-by: Vicente Olivert Riera + +diff -rup a/Makefile.am b/Makefile.am +--- a/Makefile.am 2014-11-07 15:14:39.018060884 +0000 ++++ b/Makefile.am 2014-11-07 15:30:02.864918229 +0000 +@@ -28,7 +28,7 @@ endif + + # Add doc back when we have some real content. + SUBDIRS = config m4 lib libelf libebl libdwelf libdwfl libdw libcpu libasm \ +- backends $(PROGS_SUBDIR) po tests ++ backends $(PROGS_SUBDIR) tests + + EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \ + COPYING COPYING-GPLV2 COPYING-LGPLV3 diff --git a/package/elfutils/0006-really-make-werror-conditional-to-build-werror.patch b/package/elfutils/0006-really-make-werror-conditional-to-build-werror.patch new file mode 100644 index 000000000..59aae5e8b --- /dev/null +++ b/package/elfutils/0006-really-make-werror-conditional-to-build-werror.patch @@ -0,0 +1,24 @@ +Really make -Werror conditional to BUILD_WERROR + +Otherwise it will fail with an error message like this one: + +elf_getarsym.c:290:9: error: 'n' may be used uninitialized in this +function [-Werror=maybe-uninitialized] + arsym[n].as_name = NULL; + ^ +cc1: all warnings being treated as errors + +Signed-off-by: "Yann E. MORIN" +Signed-off-by: Vicente Olivert Riera + +diff -rup a/config/eu.am b/config/eu.am +--- a/config/eu.am 2014-11-10 16:19:14.356031479 +0000 ++++ b/config/eu.am 2014-11-10 16:21:11.702072011 +0000 +@@ -35,7 +35,6 @@ LD_AS_NEEDED = @LD_AS_NEEDED@ + DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DLOCALEDIR='"${localedir}"' + AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. + AM_CFLAGS = -std=gnu99 -Wall -Wshadow \ +- $(if $($(*F)_no_Werror),,-Werror) \ + $(if $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) \ + $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) \ + $($(*F)_CFLAGS) diff --git a/package/elfutils/elfutils-02-argp-support.patch b/package/elfutils/elfutils-02-argp-support.patch deleted file mode 100644 index f81ac8f9f..000000000 --- a/package/elfutils/elfutils-02-argp-support.patch +++ /dev/null @@ -1,92 +0,0 @@ -Allow the usage of an external implementation of the argp functions - -uClibc lack the argp family of functions that glibc has. Therefore, we -add a check in the configure script to see if argp_parse is available -in the C library. If not, we look if it is available in the additional -'argp' library. If so, we link against that library. If not, we error -out. - -This allows to build elfutils against uClibc with an external argp -library. - -Signed-off-by: Thomas Petazzoni - -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -269,6 +269,13 @@ - enable_progs=yes) - AM_CONDITIONAL(ENABLE_PROGS, test "$enable_progs" = yes) - -+AC_CHECK_FUNC([argp_parse]) -+if test "$ac_cv_func_argp_parse" != yes; then -+ AC_CHECK_LIB([argp],[argp_parse],ARGP_LIBS=-largp, -+ AC_MSG_ERROR([No argp_parse function available.])) -+fi -+AC_SUBST(ARGP_LIBS) -+ - dnl Test for zlib and bzlib, gives ZLIB/BZLIB .am - dnl conditional and config.h USE_ZLIB/USE_BZLIB #define. - save_LIBS="$LIBS" -Index: b/src/Makefile.am -=================================================================== ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -98,26 +98,29 @@ - # Buggy old compilers. - readelf_no_Werror = yes - --readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl -+readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \ -+ $(ARGP_LIBS) - nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \ -- $(demanglelib) --size_LDADD = $(libelf) $(libeu) $(libmudflap) --strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl --ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl -+ $(demanglelib) $(ARGP_LIBS) -+size_LDADD = $(libelf) $(libeu) $(libmudflap) $(ARGP_LIBS) -+strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl $(ARGP_LIBS) -+ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl $(ARGP_LIBS) - if NATIVE_LD - # -ldl is always needed for libebl. - ld_LDADD += libld_elf.a - endif - ld_LDFLAGS = -rdynamic --elflint_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl --findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap) --addr2line_LDADD = $(libdw) $(libelf) $(libmudflap) --elfcmp_LDADD = $(libebl) $(libelf) $(libmudflap) -ldl --objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl --ranlib_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) --strings_LDADD = $(libelf) $(libeu) $(libmudflap) --ar_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) --unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) -ldl -+elflint_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl $(ARGP_LIBS) -+findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap) $(ARGP_LIBS) -+addr2line_LDADD = $(libdw) $(libelf) $(libmudflap) $(ARGP_LIBS) -+elfcmp_LDADD = $(libebl) $(libelf) $(libmudflap) -ldl $(ARGP_LIBS) -+objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \ -+ $(ARGP_LIBS) -+ranlib_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) $(ARGP_LIBS) -+strings_LDADD = $(libelf) $(libeu) $(libmudflap) $(ARGP_LIBS) -+ar_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) $(ARGP_LIBS) -+unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) -ldl \ -+ $(ARGP_LIBS) - - ldlex.o: ldscript.c - ldlex_no_Werror = yes -Index: b/libdw/Makefile.am -=================================================================== ---- a/libdw/Makefile.am -+++ b/libdw/Makefile.am -@@ -111,7 +111,7 @@ - -Wl,--enable-new-dtags,-rpath,$(pkglibdir) \ - -Wl,--version-script,$<,--no-undefined \ - -Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\ -- -ldl $(zip_LIBS) -+ -ldl $(zip_LIBS) $(ARGP_LIBS) - if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi - ln -fs $@ $@.$(VERSION) - diff --git a/package/elfutils/elfutils-05-disable-po.patch b/package/elfutils/elfutils-05-disable-po.patch deleted file mode 100644 index d98da0b0f..000000000 --- a/package/elfutils/elfutils-05-disable-po.patch +++ /dev/null @@ -1,22 +0,0 @@ -Disable the build of the po/ directory - -Building the po/ directory complains that the scripts in there have -been generated with gettext 0.17, while we use gettext 0.18 in -Buildroot. Since we don't care that much about po files anyway, just -disable the build of this directory. - -Signed-off-by: Thomas Petazzoni - -Index: b/Makefile.am -=================================================================== ---- a/Makefile.am -+++ b/Makefile.am -@@ -28,7 +28,7 @@ - - # Add doc back when we have some real content. - SUBDIRS = config m4 lib libelf libebl libdwfl libdw libcpu libasm backends \ -- $(PROGS_SUBDIR) po tests -+ $(PROGS_SUBDIR) tests - - EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \ - COPYING COPYING-GPLV2 COPYING-LGPLV3 diff --git a/package/elfutils/elfutils.hash b/package/elfutils/elfutils.hash new file mode 100644 index 000000000..f0f459831 --- /dev/null +++ b/package/elfutils/elfutils.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 741b556863c069ceab2d81eb54aeda8c34f46728859704eaf9baef8503e9a9d1 elfutils-0.160.tar.bz2 +sha256 feb307acf472598ea7af4e4b439251613a8f5d81e804b4abf9aeca195a5d4254 elfutils-portability.patch diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index 4f00a27a6..4914b3b6f 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELFUTILS_VERSION = 0.155 +ELFUTILS_VERSION = 0.160 ELFUTILS_SOURCE = elfutils-$(ELFUTILS_VERSION).tar.bz2 ELFUTILS_SITE = https://fedorahosted.org/releases/e/l/elfutils/$(ELFUTILS_VERSION) ELFUTILS_LICENSE = GPLv3 GPLv2 LGPLv3 @@ -13,9 +13,7 @@ ELFUTILS_LICENSE_FILES = COPYING COPYING-GPLV2 COPYING-LGPLV3 # The tarball does not have a generated configure script ELFUTILS_AUTORECONF = YES ELFUTILS_CONF_OPTS += --disable-werror -ELFUTILS_PATCH = \ - elfutils-portability.patch \ - elfutils-robustify.patch +ELFUTILS_PATCH = elfutils-portability.patch ELFUTILS_INSTALL_STAGING = YES diff --git a/package/evemu/evemu-0001-SYN_MAX.patch b/package/evemu/evemu-0001-SYN_MAX.patch deleted file mode 100644 index b128794f7..000000000 --- a/package/evemu/evemu-0001-SYN_MAX.patch +++ /dev/null @@ -1,25 +0,0 @@ -[PATCH] make-event-names.py: fix SYN_MAX definition for modern kernel headers - -SYN_MAX has been exported to user space since 3.12 (52764fed5: Input: add -SYN_MAX and SYN_CNT constants), so only define it locally if not already -defined, otherwise the build breaks. - -Signed-off-by: Peter Korsgaard ---- - src/make-event-names.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/make-event-names.py b/src/make-event-names.py -index bc77f2c..2d0924d 100755 ---- a/src/make-event-names.py -+++ b/src/make-event-names.py -@@ -92,7 +92,9 @@ def print_mapping_table(bits): - print("#ifndef EVENT_NAMES_H") - print("#define EVENT_NAMES_H") - print("") -+ print("#ifndef SYN_MAX") - print("#define SYN_MAX 3 /* linux/input.h doesn't define that */") -+ print("#endif") - print("") - - for prefix in prefixes: diff --git a/package/evemu/evemu-0002-configure.ac-add-disable-tests-option.patch b/package/evemu/evemu-0002-configure.ac-add-disable-tests-option.patch deleted file mode 100644 index c470c44f9..000000000 --- a/package/evemu/evemu-0002-configure.ac-add-disable-tests-option.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 628835a5addbe3dbf49fbd221b3785518c7b26ac Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Sun, 27 Apr 2014 13:14:51 +0200 -Subject: [PATCH] configure.ac: add '--disable-tests' option - -Signed-off-by: Peter Seiderer ---- - Makefile.am | 2 +- - configure.ac | 9 +++++++++ - 2 files changed, 10 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 7b68f3d..a83b35f 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,4 +1,4 @@ --SUBDIRS = src tools python test -+SUBDIRS = src tools python $(SUBDIR_TESTS) - - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = evemu.pc -diff --git a/configure.ac b/configure.ac -index 239811c..c7e16b3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -45,6 +45,15 @@ if test "x$XMLTO" = "x" || test "x$ASCIIDOC" = "x"; then - AC_MSG_WARN([xmlto or asciidoc not found - cannot create man pages without it]) - fi - -+AC_ARG_ENABLE([tests], -+ AS_HELP_STRING([--disable-tests], [Disable running tests])) -+ -+AS_IF([test "x$enable_tests" != "xno"], [ -+ SUBDIR_TESTS=test -+]) -+ -+AC_SUBST([SUBDIR_TESTS]) -+ - AC_SUBST(AM_CFLAGS, - "-Wall -Wextra") - --- -1.8.1.4 - diff --git a/package/evemu/evemu-0003-make-event-names-use-input.h-from-sysroot-instead-of.patch b/package/evemu/evemu-0003-make-event-names-use-input.h-from-sysroot-instead-of.patch deleted file mode 100644 index 5ac3e7451..000000000 --- a/package/evemu/evemu-0003-make-event-names-use-input.h-from-sysroot-instead-of.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 6e0a0631d97b17a82f6ce1996bcb49ee2dbe1544 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Fri, 25 Apr 2014 22:30:06 +0200 -Subject: [PATCH] make-event-names: use input.h from sysroot (instead of host - system version) - -Signed-off-by: Peter Seiderer ---- - src/make-event-names.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/make-event-names.py b/src/make-event-names.py -index 2d0924d..945d473 100755 ---- a/src/make-event-names.py -+++ b/src/make-event-names.py -@@ -10,8 +10,10 @@ from __future__ import print_function - import argparse - import re - import sys -+import os - --SOURCE_FILE = "/usr/include/linux/input.h" -+# environment variable SYSROOT set by buildroot for cross-compilation -+SOURCE_FILE = os.environ.get('SYSROOT', '') + "/usr/include/linux/input.h" - - class Bits(object): - pass --- -1.8.1.4 - diff --git a/package/evemu/evemu-0005-configure.ac-add-disable-python-bindings-option.patch b/package/evemu/evemu-0005-configure.ac-add-disable-python-bindings-option.patch deleted file mode 100644 index 177d01829..000000000 --- a/package/evemu/evemu-0005-configure.ac-add-disable-python-bindings-option.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 4618fb3b788715c754872df5fed7bce0186f5089 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Sun, 27 Apr 2014 13:23:41 +0200 -Subject: [PATCH] configure.ac: add '--disable-python-bindings' option - -Signed-off-by: Peter Seiderer ---- - Makefile.am | 2 +- - configure.ac | 11 +++++++++++ - 2 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index a83b35f..fb87c76 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,4 +1,4 @@ --SUBDIRS = src tools python $(SUBDIR_TESTS) -+SUBDIRS = src tools $(SUBDIR_PYTHON_BINDINGS) $(SUBDIR_TESTS) - - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = evemu.pc -diff --git a/configure.ac b/configure.ac -index c7e16b3..72c5fdf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -54,6 +54,17 @@ AS_IF([test "x$enable_tests" != "xno"], [ - - AC_SUBST([SUBDIR_TESTS]) - -+AC_ARG_ENABLE([python-bindings], -+ AS_HELP_STRING([--disable-python-bindings], -+ [Disable generation of python bindings])) -+ -+AS_IF([test "x$enable_python_bindings" != "xno"], [ -+ SUBDIR_PYTHON_BINDINGS=python -+]) -+ -+AC_SUBST([SUBDIR_PYTHON_BINDINGS]) -+ -+ - AC_SUBST(AM_CFLAGS, - "-Wall -Wextra") - --- -1.8.1.4 - diff --git a/package/evemu/evemu.hash b/package/evemu/evemu.hash new file mode 100644 index 000000000..99668b7e5 --- /dev/null +++ b/package/evemu/evemu.hash @@ -0,0 +1,2 @@ +# Hash from http://lists.freedesktop.org/archives/input-tools/2014-November/001125.html +sha256 0c87360882751356e9f977ebf7438c00fe97deb232ac725dd86e5ba78203ee97 evemu-2.1.0.tar.xz diff --git a/package/evemu/evemu.mk b/package/evemu/evemu.mk index 368eb8a76..9acdbe24f 100644 --- a/package/evemu/evemu.mk +++ b/package/evemu/evemu.mk @@ -4,8 +4,9 @@ # ################################################################################ -EVEMU_VERSION = 2.0.0 -EVEMU_SITE = http://cgit.freedesktop.org/evemu/snapshot +EVEMU_VERSION = 2.1.0 +EVEMU_SITE = http://www.freedesktop.org/software/evemu +EVEMU_SOURCE = evemu-$(EVEMU_VERSION).tar.xz EVEMU_LICENSE = LGPLv3 (library), GPLv3 (tools) EVEMU_LICENSE_FILES = COPYING COPYING.GPL3 @@ -14,19 +15,12 @@ EVEMU_LICENSE_FILES = COPYING COPYING.GPL3 # which doesn't have all the needed modules enabled, breaking the build EVEMU_CONF_ENV = ac_cv_path_ASCIIDOC="" -# needed for make-event-names.py to find sysroot provided input.h (instead -# of host system version) -EVEMU_MAKE_ENV = SYSROOT=$(STAGING_DIR) - # disable tests generation because of C++ dependency EVEMU_CONF_OPTS += --disable-tests # Uses PKG_CHECK_MODULES() in configure.ac EVEMU_DEPENDENCIES = host-pkgconf libevdev -# Needs Python for header file generation -EVEMU_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) - # Check for target python ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) EVEMU_CONF_OPTS += --enable-python-bindings @@ -35,8 +29,4 @@ else EVEMU_CONF_OPTS += --disable-python-bindings endif -# package source code coming from git, so it doesn't have generated -# configure and Makefile.in -EVEMU_AUTORECONF = YES - $(eval $(autotools-package)) diff --git a/package/exiv2/Config.in b/package/exiv2/Config.in new file mode 100644 index 000000000..3dc74459a --- /dev/null +++ b/package/exiv2/Config.in @@ -0,0 +1,57 @@ +comment "exiv2 needs a toolchain w/ C++, dynamic library" + depends on BR2_PREFER_STATIC_LIB || !BR2_INSTALL_LIBSTDCPP + +config BR2_PACKAGE_EXIV2 + bool "exiv2" + depends on !BR2_PREFER_STATIC_LIB + depends on BR2_INSTALL_LIBSTDCPP + help + Exiv2 is a C++ library and a command line utility to manage + image metadata. It provides fast and easy read and write + access to the Exif, IPTC and XMP metadata of images in + various formats. + + Exiv2 is available under the GPLv2+ or under a commercial + license. + + http://www.exiv2.org/ + +if BR2_PACKAGE_EXIV2 + +config BR2_PACKAGE_EXIV2_COMMERCIAL + bool "Enable commercial" + help + Build the commercial version for closed source project. + + The Nikon lens name database and the NLS support is disabled + for copyright reasons. + + A commercial license request is needed. + http://www.exiv2.org/download.html#license + +config BR2_PACKAGE_EXIV2_PNG + bool "PNG image support" + select BR2_PACKAGE_ZLIB + help + Build with PNG image support + +config BR2_PACKAGE_EXIV2_XMP + bool "XMP support" + select BR2_PACKAGE_EXPAT + depends on BR2_TOOLCHAIN_HAS_THREADS + help + Build with XMP support + +comment "xmp support needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS + +config BR2_PACKAGE_EXIV2_LENSDATA + bool "Nikon lens name database" + depends on !BR2_PACKAGE_EXIV2_COMMERCIAL + help + Integrate Nikon lens name database. + + This database is integrated but comes from a thirdparty: + http://www.rottmerhusen.com/objektives/lensid/thirdparty.html. + +endif diff --git a/package/exiv2/exiv2.hash b/package/exiv2/exiv2.hash new file mode 100644 index 000000000..d4f8c6076 --- /dev/null +++ b/package/exiv2/exiv2.hash @@ -0,0 +1,4 @@ +# From http://www.exiv2.org/download.html +md5 b8a23dc56a98ede85c00718a97a8d6fc exiv2-0.24.tar.gz +# Locally calculated +sha256 f4a443e6c7fb9d9f5e787732f76969a64c72c4c04af69b10ed57f949c2dfef8e exiv2-0.24.tar.gz diff --git a/package/exiv2/exiv2.mk b/package/exiv2/exiv2.mk new file mode 100644 index 000000000..93e36f725 --- /dev/null +++ b/package/exiv2/exiv2.mk @@ -0,0 +1,47 @@ +################################################################################ +# +# exiv2 +# +################################################################################ + +EXIV2_VERSION = 0.24 +EXIV2_SITE = http://www.exiv2.org +EXIV2_INSTALL_STAGING = YES + +EXIV2_CONF_OPTS += -DEXIV2_ENABLE_BUILD_SAMPLES=OFF + +ifeq ($(BR2_PACKAGE_EXIV2_LENSDATA),) +EXIV2_CONF_OPTS += -DEXIV2_ENABLE_LENSDATA=OFF +endif + +ifeq ($(BR2_PACKAGE_EXIV2_COMMERCIAL),y) +EXIV2_LICENSE = commercial +# NLS support is disabled in commercial version due to the copyright +# of the translated texts. +EXIV2_CONF_OPTS += -DEXIV2_ENABLE_COMMERCIAL=ON -DEXIV2_ENABLE_NLS=OFF +else +EXIV2_LICENSE = GPLv2+ +EXIV2_LICENSE_FILES = COPYING +endif + +ifeq ($(BR2_PACKAGE_EXIV2_PNG),y) +EXIV2_CONF_OPTS += -DEXIV2_ENABLE_PNG=ON +EXIV2_DEPENDENCIES += zlib +else +EXIV2_CONF_OPTS += -DEXIV2_ENABLE_PNG=OFF +endif + +ifeq ($(BR2_PACKAGE_EXIV2_XMP),y) +EXIV2_CONF_OPTS += -DEXIV2_ENABLE_XMP=ON -DEXIV2_ENABLE_LIBXMP=ON +EXIV2_DEPENDENCIES += expat +else +EXIV2_CONF_OPTS += -DEXIV2_ENABLE_XMP=OFF -DEXIV2_ENABLE_LIBXMP=OFF +endif + +ifeq ($(BR2_ENABLE_LOCALE),y) +EXIV2_CONF_OPTS += -DEXIV2_ENABLE_NLS=ON +else +EXIV2_CONF_OPTS += -DEXIV2_ENABLE_NLS=OFF +endif + +$(eval $(cmake-package)) diff --git a/package/flac/0001-configure-don-t-try-to-unset-g-from-CFLAGS.txt b/package/flac/0001-configure-don-t-try-to-unset-g-from-CFLAGS.txt new file mode 100644 index 000000000..3aff5a8c9 --- /dev/null +++ b/package/flac/0001-configure-don-t-try-to-unset-g-from-CFLAGS.txt @@ -0,0 +1,27 @@ +The sed expression is wrong, any flags with '-g' in any position gets +zapped, for example: + +-mfloat-gprs=double (for powerpc e500) -> -mfloatprs=double. + +Which gives build errors and is perfectly valid in real use scenarios to +switch from e500v1 (single precision) code to e500v2 (double precision) code. + +Signed-off-by: Gustavo Zacarias + +diff -Nura flac-1.3.1.orig/configure flac-1.3.1/configure +--- flac-1.3.1.orig/configure 2014-11-27 20:43:29.921303105 -0300 ++++ flac-1.3.1/configure 2014-11-27 20:45:33.460250179 -0300 +@@ -19870,11 +19870,10 @@ + + if test "x$debug" = xtrue; then + CPPFLAGS="-DDEBUG $CPPFLAGS" +- CFLAGS=$(echo "$CFLAGS" | sed 's/-g//') +- CFLAGS="-g $CFLAGS" ++ CFLAGS=$(echo "-g $CFLAGS") + else + CPPFLAGS="-DNDEBUG $CPPFLAGS" +- CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//') ++ CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//') + CFLAGS="-O3 -funroll-loops $CFLAGS" + fi + diff --git a/package/flac/0001-fix-altivec-logic.patch b/package/flac/0001-fix-altivec-logic.patch deleted file mode 100644 index a1ac8a1fd..000000000 --- a/package/flac/0001-fix-altivec-logic.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d65ede3e874c79348efc85cf3a185c170046c4c8 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Wed, 4 Dec 2013 13:31:28 -0300 -Subject: [PATCH] Fix Makefile.am altivec logic - -Besides SPE (FSL e500v? cores) there are other powerpc processors -that don't support altivec instructions so only enable them when it's -100% sure that the target has it. - -Signed-off-by: Gustavo Zacarias -Signed-off-by: Erik de Castro Lopo ---- - src/libFLAC/Makefile.am | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am -index 247e33c..258de40 100644 ---- a/src/libFLAC/Makefile.am -+++ b/src/libFLAC/Makefile.am -@@ -47,8 +47,7 @@ CPUCFLAGS = -faltivec -force_cpusubtype_ALL -DFLAC__NO_ASM - else - # Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific - CPUCFLAGS = --if FLaC__CPU_PPC_SPE --else -+if FLaC__USE_ALTIVEC - CPUCFLAGS += -maltivec -mabi=altivec - endif - #@@@ PPC optimizations temporarily disabled --- -1.8.3.2 - diff --git a/package/flac/flac.hash b/package/flac/flac.hash new file mode 100644 index 000000000..6a0da1162 --- /dev/null +++ b/package/flac/flac.hash @@ -0,0 +1,2 @@ +# From http://downloads.xiph.org/releases/flac/SHA256SUMS.txt +sha256 4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c flac-1.3.1.tar.xz diff --git a/package/flac/flac.mk b/package/flac/flac.mk index daedd4755..b819064c2 100644 --- a/package/flac/flac.mk +++ b/package/flac/flac.mk @@ -4,11 +4,10 @@ # ################################################################################ -FLAC_VERSION = 1.3.0 +FLAC_VERSION = 1.3.1 FLAC_SITE = http://downloads.xiph.org/releases/flac FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz FLAC_INSTALL_STAGING = YES -FLAC_AUTORECONF = YES FLAC_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) FLAC_LICENSE = Xiph BSD-like (libFLAC), GPLv2+ (tools), LGPLv2.1+ (other libraries) FLAC_LICENSE_FILES = COPYING.Xiph COPYING.GPL COPYING.LGPL diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in index d8c6efc23..71b7f0ba7 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -45,6 +45,9 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM source "package/freescale-imx/imx-lib/Config.in" source "package/freescale-imx/imx-vpu/Config.in" source "package/freescale-imx/firmware-imx/Config.in" +if (BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51 || BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53) +source "package/freescale-imx/libz160/Config.in" +endif if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q source "package/freescale-imx/gpu-viv-bin-mx6q/Config.in" endif diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk index d26b31c1e..f5ed353ae 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -7,27 +7,18 @@ FIRMWARE_IMX_VERSION = $(FREESCALE_IMX_VERSION) FIRMWARE_IMX_SITE = $(FREESCALE_IMX_SITE) FIRMWARE_IMX_SOURCE = firmware-imx-$(FIRMWARE_IMX_VERSION).bin + FIRMWARE_IMX_LICENSE = Freescale Semiconductor Software License Agreement, \ Atheros license (ath6k) -FIRMWARE_IMX_LICENSE_FILES = licenses/vpu/EULA licenses/ath6k/AR6102/License.txt -# This is a legal minefield: the EULA specifies that -# the Board Support Package includes software and hardware (sic!) -# for which a separate license is needed... +FIRMWARE_IMX_LICENSE_FILES = EULA licenses/vpu/EULA licenses/ath6k/AR6102/License.txt FIRMWARE_IMX_REDISTRIBUTE = NO FIRMWARE_IMX_BLOBS = ath6k sdma vpu -# The archive is a shell-self-extractor of a bzipped tar. It happens -# to extract in the correct directory (firmware-imx-x.y.z) -# The --force makes sure it doesn't fail if the source dir already exists. -# The --auto-accept skips the license check - not needed for us -# because we have legal-info. define FIRMWARE_IMX_EXTRACT_CMDS - cd $(BUILD_DIR); \ - sh $(DL_DIR)/$(FIRMWARE_IMX_SOURCE) --force --auto-accept + $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(FIRMWARE_IMX_SOURCE)) endef - define FIRMWARE_IMX_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/lib/firmware for blobdir in $(FIRMWARE_IMX_BLOBS); do \ diff --git a/package/freescale-imx/freescale-imx.mk b/package/freescale-imx/freescale-imx.mk index c52fc1169..64f3b6b57 100644 --- a/package/freescale-imx/freescale-imx.mk +++ b/package/freescale-imx/freescale-imx.mk @@ -7,4 +7,29 @@ FREESCALE_IMX_VERSION = 3.10.17-1.0.0 FREESCALE_IMX_SITE = http://www.freescale.com/lgfiles/NMG/MAD/YOCTO +# Helper for self-extracting binaries distributed by Freescale. +# +# The --force option makes sure it doesn't fail if the source +# directory already exists. The --auto-accept skips the license check, +# as it is not needed in Buildroot because we have legal-info. Since +# there's a EULA in the binary file, we extract it in this macro, and +# it should therefore be added to the LICENSE_FILES variable of +# packages using this macro. Also, remember to set REDISTRIBUTE to +# "NO". Indeed, this is a legal minefield: the EULA specifies that the +# Board Support Package includes software and hardware (sic!) for +# which a separate license is needed... +# +# $(1): full path to the archive file +# +define FREESCALE_IMX_EXTRACT_HELPER + awk 'BEGIN { start = 0; } \ + /^EOEULA/ { start = 0; } \ + { if (start) print; } \ + /< $(@D)/EULA + cd $(@D) && sh $(1) --force --auto-accept + find $(@D)/$(basename $(notdir $(1))) -mindepth 1 -maxdepth 1 -exec mv {} $(@D) \; + rmdir $(@D)/$(basename $(notdir $(1))) +endef + include $(sort $(wildcard package/freescale-imx/*/*.mk)) diff --git a/package/freescale-imx/imx-vpu/imx-vpu.mk b/package/freescale-imx/imx-vpu/imx-vpu.mk index e0292eda5..ab3634d0f 100644 --- a/package/freescale-imx/imx-vpu/imx-vpu.mk +++ b/package/freescale-imx/imx-vpu/imx-vpu.mk @@ -6,8 +6,6 @@ IMX_VPU_VERSION = $(FREESCALE_IMX_VERSION) IMX_VPU_SITE = $(FREESCALE_IMX_SITE) -IMX_VPU_LICENSE = Freescale License -IMX_VPU_LICENSE_FILES = EULA vpu/EULA.txt IMX_VPU_SOURCE = imx-vpu-$(IMX_VPU_VERSION).bin IMX_VPU_INSTALL_STAGING = YES @@ -21,21 +19,12 @@ IMX_VPU_MAKE_ENV = \ PLATFORM=$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM) \ INCLUDE="-idirafter $(LINUX_DIR)/include" -# The archive is a shell-self-extractor of a bzipped tar. It happens -# to extract in the correct directory (imx-vpu-x.y.z) -# The --force makes sure it doesn't fail if the source dir already exists. -# The --auto-accept skips the license check - not needed for us -# because we have legal-info -# Since there's a EULA in the bin file, extract it to imx-vpu-x.y.z/EULA -# +IMX_VPU_LICENSE = Freescale Semiconductor Software License Agreement +IMX_VPU_LICENSE_FILES = EULA vpu/EULA.txt +IMX_VPU_REDISTRIBUTE = NO + define IMX_VPU_EXTRACT_CMDS - awk 'BEGIN { start=0; } \ - /^EOEULA/ { start = 0; } \ - { if (start) print; } \ - /< $(@D)/EULA - cd $(BUILD_DIR); \ - sh $(DL_DIR)/$(IMX_VPU_SOURCE) --force --auto-accept + $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(IMX_VPU_SOURCE)) endef define IMX_VPU_BUILD_CMDS diff --git a/package/freescale-imx/libz160/Config.in b/package/freescale-imx/libz160/Config.in new file mode 100644 index 000000000..f956cced4 --- /dev/null +++ b/package/freescale-imx/libz160/Config.in @@ -0,0 +1,5 @@ +config BR2_PACKAGE_LIBZ160 + bool "libz160" + help + An API for user space programs to perform 2D accelerated graphics + operations on AMD GPU (included for examples in iMX5x chipsets) diff --git a/package/freescale-imx/libz160/libz160.mk b/package/freescale-imx/libz160/libz160.mk new file mode 100644 index 000000000..af43b1859 --- /dev/null +++ b/package/freescale-imx/libz160/libz160.mk @@ -0,0 +1,30 @@ +################################################################################ +# +# libz160 +# +################################################################################ + +LIBZ160_VERSION = 11.09.01 +LIBZ160_SOURCE = libz160-bin-$(LIBZ160_VERSION).bin +LIBZ160_SITE = $(FREESCALE_IMX_SITE) +LIBZ160_INSTALL_STAGING = YES + +# See freescale-imx +LIBZ160_LICENSE = Freescale Semiconductor Software License Agreement +LIBZ160_LICENSE_FILES = EULA +LIBZ160_REDISTRIBUTE = NO + +define LIBZ160_EXTRACT_CMDS + $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(LIBZ160_SOURCE)) +endef + +define LIBZ160_INSTALL_STAGING_CMDS + $(INSTALL) -D -m 755 $(@D)/usr/lib/libz160.so $(STAGING_DIR)/usr/lib/libz160.so + $(INSTALL) -D -m 644 $(@D)/usr/include/z160.h $(STAGING_DIR)/usr/include/z160.h +endef + +define LIBZ160_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 755 $(@D)/usr/lib/libz160.so $(TARGET_DIR)/usr/lib/libz160.so +endef + +$(eval $(generic-package)) diff --git a/package/git/git.hash b/package/git/git.hash new file mode 100644 index 000000000..33fed8916 --- /dev/null +++ b/package/git/git.hash @@ -0,0 +1,2 @@ +# From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc +sha256 3b87774672bbf35b4d33991dc5119d4eff47c3679e27185312a2b8b36fdad314 git-2.2.0.tar.xz diff --git a/package/git/git.mk b/package/git/git.mk index 8a69ee5d2..9e931a1cd 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,8 +4,9 @@ # ################################################################################ -GIT_VERSION = 1.8.5.4 -GIT_SITE = http://git-core.googlecode.com/files +GIT_VERSION = 2.2.0 +GIT_SOURCE = git-$(GIT_VERSION).tar.xz +GIT_SITE = https://www.kernel.org/pub/software/scm/git GIT_LICENSE = GPLv2 LGPLv2.1+ GIT_LICENSE_FILES = COPYING LGPL-2.1 GIT_DEPENDENCIES = zlib host-gettext diff --git a/package/grantlee/Config.in b/package/grantlee/Config.in index 365209abf..900c39e14 100644 --- a/package/grantlee/Config.in +++ b/package/grantlee/Config.in @@ -1,16 +1,17 @@ config BR2_PACKAGE_GRANTLEE bool "grantlee" depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # Qt Script - depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT - depends on BR2_PACKAGE_QT - select BR2_PACKAGE_QT_STL - select BR2_PACKAGE_QT_SCRIPT - select BR2_PACKAGE_QT_GUI_MODULE + depends on (BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT && BR2_PACKAGE_QT) || BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT_STL if BR2_PACKAGE_QT + select BR2_PACKAGE_QT_SCRIPT if BR2_PACKAGE_QT + select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT + select BR2_PACKAGE_QT5SCRIPT if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 help - Qt implemantation of the Django template framework + Qt implementation of the Django template framework http://www.grantlee.org comment "grantlee needs a toolchain with NPTL" depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT + depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT || BR2_PACKAGE_QT5 diff --git a/package/grantlee/grantlee-0.2.0-fix-lphread-link-error.patch b/package/grantlee/grantlee-0.2.0-fix-lphread-link-error.patch deleted file mode 100644 index 7964fd0d1..000000000 --- a/package/grantlee/grantlee-0.2.0-fix-lphread-link-error.patch +++ /dev/null @@ -1,42 +0,0 @@ -From d46475b6bb9d99a4c5c95489be6c14d0d219d5f8 Mon Sep 17 00:00:00 2001 -From: Zoltan Gyarmati -Date: Thu, 15 Nov 2012 17:00:39 +0100 -Subject: [PATCH] fix -lpthread build error - -Fixing linking time error with certain toolchains. The issue caused by a missing explicit linking to -libpthread. The failed buildlog: -Linking CXX executable testgenerictypes_exec -/home/buildroot12git/output/host/usr/lib/gcc/arm-buildroot-linux-uclibcgnueabi/4.6.3/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/buildroot12git/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libQtCore.so: undefined reference to symbol 'pthread_cancel' -/home/buildroot12git/output/host/usr/lib/gcc/arm-buildroot-linux-uclibcgnueabi/4.6.3/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: note: 'pthread_cancel' is defined in DSO /home/buildroot12git/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/lib/libpthread.so.0 so try adding it to the linker command line -/home/buildroot12git/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/lib/libpthread.so.0: could not read symbols: Invalid operation -collect2: ld returned 1 exit status -make[3]: *** [templates/tests/testgenerictypes_exec] Error 1 -make[3]: Leaving directory `/home/buildroot12git/output/build/grantlee-0.2.0' -make[2]: *** [templates/tests/CMakeFiles/testgenerictypes_exec.dir/all] Error 2 -make[2]: Leaving directory `/home/buildroot12git/output/build/grantlee-0.2.0' -make[1]: *** [all] Error 2 -make[1]: Leaving directory `/home/buildroot12git/output/build/grantlee-0.2.0' -make: *** [/home/buildroot12git/output/build/grantlee-0.2.0/.stamp_built] Error - -Signed-off-by: Zoltan Gyarmati ---- - templates/tests/CMakeLists.txt | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/templates/tests/CMakeLists.txt b/templates/tests/CMakeLists.txt -index caab003..f400622 100644 ---- a/templates/tests/CMakeLists.txt -+++ b/templates/tests/CMakeLists.txt -@@ -68,7 +68,8 @@ macro(GRANTLEE_TEMPLATES_UNIT_TESTS) - ${_testresource_rcc_src} - ) - add_test(${_testname} ${_testname}_exec ) -- target_link_libraries(${_testname}_exec ${QT_QTTEST_LIBRARY} grantlee_core ) -+ find_package (Threads) -+ target_link_libraries(${_testname}_exec ${QT_QTTEST_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} grantlee_core ) - - set_property(GLOBAL APPEND PROPERTY TEST_COVERAGE "${CMAKE_CURRENT_BINARY_DIR}/${_testname}_exec" ) - endforeach(_testname) --- -1.7.9.5 - diff --git a/package/grantlee/grantlee.mk b/package/grantlee/grantlee.mk index 539578b86..a30010636 100644 --- a/package/grantlee/grantlee.mk +++ b/package/grantlee/grantlee.mk @@ -3,12 +3,21 @@ # grantlee # ################################################################################ - -GRANTLEE_VERSION = 0.2.0 +# qt4 support dropped after 0.5.1, so we use the older version for qt4 +ifeq ($(BR2_PACKAGE_QT),y) +GRANTLEE_VERSION = 0.5.1 +else ifeq ($(BR2_PACKAGE_QT5),y) +GRANTLEE_VERSION = 5.0.0 +endif GRANTLEE_SITE = http://downloads.grantlee.org GRANTLEE_INSTALL_STAGING = YES -GRANTLEE_DEPENDENCIES = qt GRANTLEE_LICENSE = LGPLv2.1+ GRANTLEE_LICENSE_FILES = COPYING.LIB +ifeq ($(BR2_PACKAGE_QT),y) +GRANTLEE_DEPENDENCIES = qt +else ifeq ($(BR2_PACKAGE_QT5),y) +GRANTLEE_DEPENDENCIES += qt5base qt5script +endif + $(eval $(cmake-package)) diff --git a/package/grep/grep.hash b/package/grep/grep.hash new file mode 100644 index 000000000..d27a26a37 --- /dev/null +++ b/package/grep/grep.hash @@ -0,0 +1,2 @@ +# Locally calculated after checking signature +sha256 5244a11c00dee8e7e5e714b9aaa053ac6cbfa27e104abee20d3c778e4bb0e5de grep-2.21.tar.xz diff --git a/package/grep/grep.mk b/package/grep/grep.mk index 2c2477c88..80f6e71ef 100644 --- a/package/grep/grep.mk +++ b/package/grep/grep.mk @@ -4,7 +4,7 @@ # ################################################################################ -GREP_VERSION = 2.20 +GREP_VERSION = 2.21 GREP_SITE = $(BR2_GNU_MIRROR)/grep GREP_SOURCE = grep-$(GREP_VERSION).tar.xz GREP_LICENSE = GPLv3+ diff --git a/package/guile/Config.in b/package/guile/Config.in new file mode 100644 index 000000000..009dbdf27 --- /dev/null +++ b/package/guile/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_GUILE + bool "guile" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_LIBATOMIC_ARCH_SUPPORTS # bdwgc + depends on BR2_USE_WCHAR # libunistring + select BR2_PACKAGE_LIBUNISTRING + select BR2_PACKAGE_LIBFFI + select BR2_PACKAGE_GMP + select BR2_PACKAGE_BDWGC + help + Guile is an interpreter and compiler for the Scheme + programming language, a clean and elegant dialect of Lisp. + + http://www.gnu.org/software/guile + +comment "guile needs a toolchain w/ threads, wchar" + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR + diff --git a/package/guile/guile-01-fix_arm_endianness.patch b/package/guile/guile-01-fix_arm_endianness.patch new file mode 100644 index 000000000..67c0b606e --- /dev/null +++ b/package/guile/guile-01-fix_arm_endianness.patch @@ -0,0 +1,25 @@ +Fix support for ARM endianness, otherwise it gives the error +"unknown CPU endianness" + +Signed-off-by: Pedro Aguilar + +diff -Nau guile-2.0.11.orig/module/system/base/target.scm guile-2.0.11/module/system/base/target.scm +--- guile-2.0.11.orig/module/system/base/target.scm 2013-02-28 09:42:45.000000000 +0100 ++++ guile-2.0.11/module/system/base/target.scm 2014-11-03 23:05:01.789338997 +0100 +@@ -70,7 +70,15 @@ + ((member cpu '("sparc" "sparc64" "powerpc" "powerpc64" "spu" + "mips" "mips64")) + (endianness big)) +- ((string-match "^arm.*el" cpu) ++ ((string-match "^arm.*el" cpu) ++ (endianness little)) ++ ((string-match "^arm.*eb" cpu) ++ (endianness big)) ++ ((string-prefix? "arm" cpu) ;ARMs are LE by default ++ (endianness little)) ++ ((string-match "^aarch64.*be" cpu) ++ (endianness big)) ++ ((string=? "aarch64" cpu) + (endianness little)) + (else + (error "unknown CPU endianness" cpu))))) diff --git a/package/guile/guile-02-calculate-csqrt_manually.patch b/package/guile/guile-02-calculate-csqrt_manually.patch new file mode 100644 index 000000000..98bb0b685 --- /dev/null +++ b/package/guile/guile-02-calculate-csqrt_manually.patch @@ -0,0 +1,16 @@ +Avoid using scm_from_complex_double(csqrt()) when building with uclibc. + +Signed-off-by: Pedro Aguilar + +diff -Nau guile-2.0.11.orig/configure.ac guile-2.0.11/configure.ac +--- guile-2.0.11.orig/configure.ac 2014-03-12 14:36:02.000000000 +0100 ++++ guile-2.0.11/configure.ac 2014-11-03 23:59:51.897267207 +0100 +@@ -862,7 +862,7 @@ + }]])], + [guile_cv_use_csqrt=yes], + [guile_cv_use_csqrt="no, glibc 2.3 bug"], +- [guile_cv_use_csqrt="yes, hopefully (cross-compiling)"])]) ++ [guile_cv_use_csqrt="no (cross-compiling)"])]) + case $guile_cv_use_csqrt in + yes*) + AC_DEFINE([HAVE_USABLE_CSQRT], 1, [Define to 1 if csqrt is bug-free]) diff --git a/package/guile/guile-03-remove_unused_funcs.patch b/package/guile/guile-03-remove_unused_funcs.patch new file mode 100644 index 000000000..3d70ee9fc --- /dev/null +++ b/package/guile/guile-03-remove_unused_funcs.patch @@ -0,0 +1,36 @@ +Remove unused static inline functions str_upcase_l() and +str_downcase_l() that cause the compilation error: +'dereferencing pointer to incomplete type'. + +Signed-off-by: Pedro Aguilar + +diff -Nau guile-2.0.11.orig/libguile/i18n.c guile-2.0.11/libguile/i18n.c +--- guile-2.0.11.orig/libguile/i18n.c 2014-01-21 22:25:11.000000000 +0100 ++++ guile-2.0.11/libguile/i18n.c 2014-11-04 23:18:52.675435613 +0100 +@@ -851,26 +851,6 @@ + *dst = '\0'; + } + +-#ifdef USE_GNU_LOCALE_API +-static inline void +-str_upcase_l (register char *dst, register const char *src, +- scm_t_locale locale) +-{ +- for (; *src != '\0'; src++, dst++) +- *dst = toupper_l (*src, locale); +- *dst = '\0'; +-} +- +-static inline void +-str_downcase_l (register char *dst, register const char *src, +- scm_t_locale locale) +-{ +- for (; *src != '\0'; src++, dst++) +- *dst = tolower_l (*src, locale); +- *dst = '\0'; +-} +-#endif +- + + SCM_DEFINE (scm_string_locale_lt, "string-locale" - move dummy definition from libkmod-internal.h to missing.h - update commit title] +[Vicente: Adapt this patch to version 19.] + Signed-off-by: Thomas De Schampheleire +Signed-off-by: Vicente Olivert Riera Upstream-status: rejected, suggests to add in buildroot instead [1] [1] http://news.gmane.org/find-root.php?message_id=1412062906%2d27378%2d1%2dgit%2dsend%2demail%2dpatrickdepinguin%40gmail.com --- - libkmod/missing.h | 4 ++++ + shared/missing.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) -diff --git a/libkmod/missing.h b/libkmod/missing.h +diff --git a/shared/missing.h b/shared/missing.h index 4c0d136..e123e98 100644 ---- a/libkmod/missing.h -+++ b/libkmod/missing.h +--- a/shared/missing.h ++++ b/shared/missing.h @@ -19,6 +19,10 @@ # define __NR_finit_module -1 #endif diff --git a/package/kmod/kmod-0002-add-backup-implementation-of-be32toh.patch b/package/kmod/kmod-0002-add-backup-implementation-of-be32toh.patch deleted file mode 100644 index 869c56950..000000000 --- a/package/kmod/kmod-0002-add-backup-implementation-of-be32toh.patch +++ /dev/null @@ -1,72 +0,0 @@ -From bda1ed2aefee23b0eedbcd9f82e73c2547908438 Mon Sep 17 00:00:00 2001 -From: Randy MacLeod -Date: Mon, 29 Sep 2014 12:32:20 +0200 -Subject: [PATCH] Add back-up implementation of be32toh() - -Older systems may not have the be32toh function defined. Check for this -and fall back to checking the endianness and calling bswap_32 directly -if needed. This works on both old and new systems. - -[Thomas De Schampheleire : -address comments raised by Lucas De Marchi [1], update commit message] - -Signed-off-by: Thomas De Schampheleire - -Upstream-status: accepted [2] - -[1] http://www.spinics.net/lists/linux-modules/msg01129.html -[2] https://git.kernel.org/cgit/utils/kernel/kmod/kmod.git/commit/?id=9b34db1ae63427269f918b2868b4cfcb50e6259b - ---- - configure.ac | 3 +++ - libkmod/libkmod-signature.c | 1 + - libkmod/missing.h | 10 ++++++++++ - 3 files changed, 14 insertions(+), 0 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7781ce1..cd676bc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -53,6 +53,9 @@ AC_CHECK_MEMBERS([struct stat.st_mtim], [], [], [#include ]) - # musl 1.0 and bionic 4.4 don't have strndupa - AC_CHECK_DECLS_ONCE([strndupa]) - -+# RHEL 5 and older do not have be32toh -+AC_CHECK_DECLS_ONCE([be32toh]) -+ - # Check kernel headers - AC_CHECK_HEADERS_ONCE([linux/module.h]) - -diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c -index a3ac15e..28f993e 100644 ---- a/libkmod/libkmod-signature.c -+++ b/libkmod/libkmod-signature.c -@@ -25,6 +25,7 @@ - #include - - #include "libkmod-internal.h" -+#include "missing.h" - - /* These types and tables were copied from the 3.7 kernel sources. - * As this is just description of the signature format, it should not be -diff --git a/libkmod/missing.h b/libkmod/missing.h -index 8d47af8..4c0d136 100644 ---- a/libkmod/missing.h -+++ b/libkmod/missing.h -@@ -43,3 +43,13 @@ static inline int finit_module(int fd, const char *uargs, int flags) - memcpy(__new, __old, __len); \ - }) - #endif -+ -+#if !HAVE_DECL_BE32TOH -+#include -+#include -+#if __BYTE_ORDER == __LITTLE_ENDIAN -+#define be32toh(x) bswap_32 (x) -+#else -+#define be32toh(x) (x) -+#endif -+#endif --- -1.7.1 - diff --git a/package/kmod/kmod.hash b/package/kmod/kmod.hash index 8244fd9ed..28f1ca10f 100644 --- a/package/kmod/kmod.hash +++ b/package/kmod/kmod.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/utils/kernel/kmod/sha256sums.asc -sha256 e16e57272b54acb219c465b334715cfdddb5d97ff5d8948d4830ca1a372a868e kmod-18.tar.xz +sha256 3e7fee6eeff5435848b2dcc852bc8959066478d687d232284d67300c071e7b14 kmod-19.tar.xz diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk index 99ab3877d..cc185c883 100644 --- a/package/kmod/kmod.mk +++ b/package/kmod/kmod.mk @@ -4,7 +4,7 @@ # ################################################################################ -KMOD_VERSION = 18 +KMOD_VERSION = 19 KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod KMOD_INSTALL_STAGING = YES diff --git a/package/libatomic_ops/libatomic_ops.mk b/package/libatomic_ops/libatomic_ops.mk index d47390134..6a26775e7 100644 --- a/package/libatomic_ops/libatomic_ops.mk +++ b/package/libatomic_ops/libatomic_ops.mk @@ -20,3 +20,4 @@ LIBATOMIC_OPS_LICENSE_FILES = doc/LICENSING.txt COPYING LIBATOMIC_OPS_INSTALL_STAGING = YES $(eval $(autotools-package)) +$(eval $(host-autotools-package)) diff --git a/package/libevdev/libevdev.hash b/package/libevdev/libevdev.hash new file mode 100644 index 000000000..b53a4cea6 --- /dev/null +++ b/package/libevdev/libevdev.hash @@ -0,0 +1,2 @@ +# Hash from http://lists.freedesktop.org/archives/input-tools/2014-November/001123.html +sha256 4b7c76195f0087023142f26c5fd2c254b35c861880c6902d3dd9b27daeec2643 libevdev-1.3.1.tar.xz diff --git a/package/libevdev/libevdev.mk b/package/libevdev/libevdev.mk index fde7d3ce9..2fc8ff723 100644 --- a/package/libevdev/libevdev.mk +++ b/package/libevdev/libevdev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEVDEV_VERSION = 1.2.2 +LIBEVDEV_VERSION = 1.3.1 LIBEVDEV_SITE = http://www.freedesktop.org/software/libevdev/ LIBEVDEV_SOURCE = libevdev-$(LIBEVDEV_VERSION).tar.xz LIBEVDEV_LICENSE = X11 diff --git a/package/libfslcodec/libfslcodec.mk b/package/libfslcodec/libfslcodec.mk index 1a364bb7d..fe6f0ba50 100644 --- a/package/libfslcodec/libfslcodec.mk +++ b/package/libfslcodec/libfslcodec.mk @@ -7,30 +7,14 @@ LIBFSLCODEC_VERSION = 3.0.11 LIBFSLCODEC_SITE = $(FREESCALE_IMX_SITE) LIBFSLCODEC_SOURCE = libfslcodec-$(LIBFSLCODEC_VERSION).bin -LIBFSLCODEC_LICENSE = Freescale Semiconductor Software License Agreement, BSD-3c (flac, ogg headers) -LIBFSLCODEC_LICENSE_FILES = EULA EULA.txt -# This is a legal minefield: the EULA in the bin file specifies that -# the Board Support Package includes software and hardware (sic!) -# for which a separate license is needed... -LIBFSLCODEC_REDISTRIBUTE = NO - LIBFSLCODEC_INSTALL_STAGING = YES -# The archive is a shell-self-extractor of a bzipped tar. It happens -# to extract in the correct directory (libfslcodec-x.y.z) -# The --force makes sure it doesn't fail if the source dir already exists. -# The --auto-accept skips the license check - not needed for us -# because we have legal-info. -# Since the EULA in the bin file differs from the one in the tar file, -# extract the one from the bin file as well. +LIBFSLCODEC_LICENSE = Freescale Semiconductor Software License Agreement, BSD-3c (flac, ogg headers) +LIBFSLCODEC_LICENSE_FILES = EULA EULA.txt +LIBFSLCODEC_REDISTRIBUTE = NO + define LIBFSLCODEC_EXTRACT_CMDS - awk 'BEGIN { start=0; } \ - /^EOEULA/ { start = 0; } \ - { if (start) print; } \ - /< $(@D)/EULA - cd $(BUILD_DIR); \ - sh $(DL_DIR)/$(LIBFSLCODEC_SOURCE) --force --auto-accept + $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(LIBFSLCODEC_SOURCE)) endef # FIXME The Makefile installs both the arm9 and arm11 versions of the diff --git a/package/libfslparser/libfslparser.mk b/package/libfslparser/libfslparser.mk index d52b15188..706a10e6d 100644 --- a/package/libfslparser/libfslparser.mk +++ b/package/libfslparser/libfslparser.mk @@ -7,30 +7,14 @@ LIBFSLPARSER_VERSION = 3.0.11 LIBFSLPARSER_SITE = $(FREESCALE_IMX_SITE) LIBFSLPARSER_SOURCE = libfslparser-$(LIBFSLPARSER_VERSION).bin -LIBFSLPARSER_LICENSE = Freescale Semiconductor Software License Agreement -LIBFSLPARSER_LICENSE_FILES = EULA EULA.txt -# This is a legal minefield: the EULA in the bin file specifies that -# the Board Support Package includes software and hardware (sic!) -# for which a separate license is needed... -LIBFSLPARSER_REDISTRIBUTE = NO - LIBFSLPARSER_INSTALL_STAGING = YES -# The archive is a shell-self-extractor of a bzipped tar. It happens -# to extract in the correct directory (libfslparser-x.y.z) -# The --force makes sure it doesn't fail if the source dir already exists. -# The --auto-accept skips the license check - not needed for us -# because we have legal-info -# Since the EULA in the bin file differs from the one in the tar file, -# extract the one from the bin file as well. +LIBFSLPARSER_LICENSE = Freescale Semiconductor Software License Agreement +LIBFSLPARSER_LICENSE_FILES = EULA EULA.txt +LIBFSLPARSER_REDISTRIBUTE = NO + define LIBFSLPARSER_EXTRACT_CMDS - awk 'BEGIN { start=0; } \ - /^EOEULA/ { start = 0; } \ - { if (start) print; } \ - /< $(@D)/EULA - cd $(BUILD_DIR); \ - sh $(DL_DIR)/$(LIBFSLPARSER_SOURCE) --force --auto-accept + $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(LIBFSLPARSER_SOURCE)) endef # The Makefile installs several versions of the libraries, but we only diff --git a/package/libfslvpuwrap/libfslvpuwrap.mk b/package/libfslvpuwrap/libfslvpuwrap.mk index c3a5c1c74..01b299959 100644 --- a/package/libfslvpuwrap/libfslvpuwrap.mk +++ b/package/libfslvpuwrap/libfslvpuwrap.mk @@ -7,30 +7,15 @@ LIBFSLVPUWRAP_VERSION = 1.0.46 LIBFSLVPUWRAP_SITE = $(FREESCALE_IMX_SITE) LIBFSLVPUWRAP_SOURCE = libfslvpuwrap-$(LIBFSLVPUWRAP_VERSION).bin +LIBFSLVPUWRAP_DEPENDENCIES = imx-vpu +LIBFSLVPUWRAP_INSTALL_STAGING = YES + LIBFSLVPUWRAP_LICENSE = Freescale Semiconductor Software License Agreement -# N.B.: the content of the two license files is different LIBFSLVPUWRAP_LICENSE_FILES = EULA EULA.txt LIBFSLVPUWRAP_REDISTRIBUTE = NO -LIBFSLVPUWRAP_INSTALL_STAGING = YES - -LIBFSLVPUWRAP_DEPENDENCIES += imx-vpu - -# The archive is a shell-self-extractor of a bzipped tar. It happens -# to extract in the correct directory (libfslvpuwrap-x.y.z) -# The --force makes sure it doesn't fail if the source dir already exists. -# The --auto-accept skips the license check - not needed for us -# because we have legal-info -# Since the EULA in the bin file differs from the one in the tar file, -# extract the one from the bin file as well. define LIBFSLVPUWRAP_EXTRACT_CMDS - awk 'BEGIN { start=0; } \ - /^EOEULA/ { start = 0; } \ - { if (start) print; } \ - /< $(@D)/EULA - cd $(BUILD_DIR); \ - sh $(DL_DIR)/$(LIBFSLVPUWRAP_SOURCE) --force --auto-accept + $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(LIBFSLVPUWRAP_SOURCE)) endef $(eval $(autotools-package)) diff --git a/package/liboping/Config.in b/package/liboping/Config.in index ffdebbd98..65e7c8856 100644 --- a/package/liboping/Config.in +++ b/package/liboping/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_LIBOPING liboping is a C library to generate ICMP echo requests, better known as "ping packets". - http://verplant.org/liboping/ + http://noping.cc/ comment "liboping needs a toolchain w/ IPv6" depends on !BR2_INET_IPV6 diff --git a/package/liboping/liboping.hash b/package/liboping/liboping.hash index 5987d7a1d..536f6aef5 100644 --- a/package/liboping/liboping.hash +++ b/package/liboping/liboping.hash @@ -1,2 +1,2 @@ -# From http://verplant.org/liboping/#download -sha256 25cf9417fe84d70c4b1bd97f1f92e597ccdc1ec2da3b7eb311f33f5e7033a70e liboping-1.7.0.tar.gz +# From http://noping.cc/#download +sha256 824792ae7fc5e9569bacc4167b89de31f6ba8476de44760f0bc272682e894b41 liboping-1.8.0.tar.gz diff --git a/package/liboping/liboping.mk b/package/liboping/liboping.mk index bb026168f..aeaaa8a90 100644 --- a/package/liboping/liboping.mk +++ b/package/liboping/liboping.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBOPING_VERSION = 1.7.0 -LIBOPING_SITE = http://verplant.org/liboping/files +LIBOPING_VERSION = 1.8.0 +LIBOPING_SITE = http://noping.cc/files LIBOPING_INSTALL_STAGING = YES LIBOPING_DEPENDENCIES = $(if $(BR2_PACKAGE_NCURSES),ncurses) LIBOPING_CONF_OPTS = --without-perl-bindings diff --git a/package/libsoup/libsoup-01-python3-fix.patch b/package/libsoup/libsoup-01-python3-fix.patch deleted file mode 100644 index 682d57c5c..000000000 --- a/package/libsoup/libsoup-01-python3-fix.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 74f27b8305cfbcf9324a07bea93829237c86e687 Mon Sep 17 00:00:00 2001 -From: Ross Lagerwall -Date: Tue, 18 Jun 2013 08:48:44 +0100 -Subject: tld-parser.py: Force file io to use utf-8 - -This fixes an issue where the build would fail with a UnicodeDecodeError -when run in a non-utf8 locale (which is typical in build environments) -using Python 3. - -https://bugzilla.gnome.org/show_bug.cgi?id=702534 - -Patch status: upstream - -Signed-off-by: Baruch Siach - -diff --git a/libsoup/tld-parser.py b/libsoup/tld-parser.py -index c1a0346..5d9d2ba 100755 ---- a/libsoup/tld-parser.py -+++ b/libsoup/tld-parser.py -@@ -5,13 +5,14 @@ - # Based on tld-parser.c Copyright (C) 2012 Igalia S.L. - - import sys -+import codecs - - SOUP_TLD_RULE_NORMAL = 0 - SOUP_TLD_RULE_MATCH_ALL = 1 << 0 - SOUP_TLD_RULE_EXCEPTION = 1 << 1 - --tlds_file = open(sys.argv[1]) --inc_file = open(sys.argv[2], 'w') -+tlds_file = codecs.open(sys.argv[1], encoding='utf-8') -+inc_file = codecs.open(sys.argv[2], 'w', encoding='utf-8') - - first = True - for rule in tlds_file: --- -cgit v0.10.1 - diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk index 723b6cc79..70f107410 100644 --- a/package/libsoup/libsoup.mk +++ b/package/libsoup/libsoup.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBSOUP_VERSION_MAJOR = 2.43 -LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).1 +LIBSOUP_VERSION_MAJOR = 2.48 +LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).0 LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.xz LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_VERSION_MAJOR) LIBSOUP_LICENSE = LGPLv2+ diff --git a/package/libunistring/Config.in b/package/libunistring/Config.in index ebb37d979..88fc65803 100644 --- a/package/libunistring/Config.in +++ b/package/libunistring/Config.in @@ -1,8 +1,12 @@ config BR2_PACKAGE_LIBUNISTRING bool "libunistring" + depends on BR2_USE_WCHAR help The libunistring library provides functions for manipulating Unicode strings and for manipulating C strings according to the Unicode standard. http://www.gnu.org/software/libunistring/ + +comment "libunistring needs a toolchain w/ wchar" + depends on !BR2_USE_WCHAR diff --git a/package/libunistring/libunistring.mk b/package/libunistring/libunistring.mk index 3234ddcfa..fd77d1242 100644 --- a/package/libunistring/libunistring.mk +++ b/package/libunistring/libunistring.mk @@ -17,3 +17,4 @@ LIBUNISTRING_CONF_OPTS += --disable-threads endif $(eval $(autotools-package)) +$(eval $(host-autotools-package)) diff --git a/package/liburiparser/Config.in b/package/liburiparser/Config.in new file mode 100644 index 000000000..95a6fe83a --- /dev/null +++ b/package/liburiparser/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_LIBURIPARSER + bool "liburiparser" + help + uriparser is a strictly RFC 3986 compliant URI parsing and handling + library written in C. + + http://uriparser.sourceforge.net diff --git a/package/liburiparser/liburiparser.hash b/package/liburiparser/liburiparser.hash new file mode 100644 index 000000000..84340f8b9 --- /dev/null +++ b/package/liburiparser/liburiparser.hash @@ -0,0 +1,3 @@ +# From http://sourceforge.net/projects/uriparser/files/Sources/0.8.1/ +md5 4e4c5f0ee6abb111a431c45e144247aa uriparser-0.8.1.tar.bz2 +sha1 4405d8baa0d9f5bc0319e6d5e68770acab67b602 uriparser-0.8.1.tar.bz2 diff --git a/package/liburiparser/liburiparser.mk b/package/liburiparser/liburiparser.mk new file mode 100644 index 000000000..661fa960f --- /dev/null +++ b/package/liburiparser/liburiparser.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# liburiparser +# +################################################################################ + +LIBURIPARSER_VERSION = 0.8.1 +LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.bz2 +LIBURIPARSER_SITE = http://sourceforge.net/projects/uriparser/files/Sources/$(LIBURIPARSER_VERSION) +LIBURIPARSER_LICENSE = BSD-3c +LIBURIPARSER_LICENSE_FILES = COPYING +LIBURIPARSER_INSTALL_STAGING = YES +LIBURIPARSER_CONF_OPTS = --disable-test + +ifeq ($(BR2_USE_WCHAR),) +LIBURIPARSER_CONF_OPTS += --disable-wchar_t +endif + +$(eval $(autotools-package)) diff --git a/package/linux-fusion/linux-fusion.mk b/package/linux-fusion/linux-fusion.mk index c5e797674..001388c67 100644 --- a/package/linux-fusion/linux-fusion.mk +++ b/package/linux-fusion/linux-fusion.mk @@ -36,8 +36,8 @@ define LINUX_FUSION_INSTALL_TARGET_CMDS $(LINUX_FUSION_MAKE_OPTS) \ INSTALL_MOD_PATH=$(TARGET_DIR) \ -C $(@D) install - mkdir -p $(LINUX_FUSION_ETC_DIR) - cp -dpf package/linux-fusion/40-fusion.rules $(LINUX_FUSION_ETC_DIR) + $(INSTALL) -D -m 644 package/linux-fusion/40-fusion.rules \ + $(LINUX_FUSION_ETC_DIR)/40-fusion.rules endef $(eval $(generic-package)) diff --git a/package/live555/live555.mk b/package/live555/live555.mk index e933faaea..b923388de 100644 --- a/package/live555/live555.mk +++ b/package/live555/live555.mk @@ -13,48 +13,43 @@ LIVE555_INSTALL_STAGING = YES LIVE555_CFLAGS = $(TARGET_CFLAGS) +ifeq ($(BR2_PREFER_STATIC_LIB),y) +LIVE555_CONFIG_TARGET = linux +LIVE555_LIBRARY_LINK = $(TARGET_AR) cr +else +LIVE555_CONFIG_TARGET = linux-with-shared-libraries +LIVE555_LIBRARY_LINK = $(TARGET_CC) -o +endif + ifndef ($(BR2_ENABLE_LOCALE),y) LIVE555_CFLAGS += -DLOCALE_NOT_USED endif define LIVE555_CONFIGURE_CMDS - echo 'COMPILE_OPTS = $$(INCLUDES) -I. -DSOCKLEN_T=socklen_t $(LIVE555_CFLAGS)' >> $(@D)/config.linux - echo 'C_COMPILER = $(TARGET_CC)' >> $(@D)/config.linux - echo 'CPLUSPLUS_COMPILER = $(TARGET_CXX)' >> $(@D)/config.linux - echo 'LINK = $(TARGET_CXX) -o' >> $(@D)/config.linux - echo 'LINK_OPTS = -L. $(TARGET_LDFLAGS)' >> $(@D)/config.linux - (cd $(@D); ./genMakefiles linux) + echo 'COMPILE_OPTS = $$(INCLUDES) -I. -DSOCKLEN_T=socklen_t $(LIVE555_CFLAGS)' >> $(@D)/config.$(LIVE555_CONFIG_TARGET) + echo 'C_COMPILER = $(TARGET_CC)' >> $(@D)/config.$(LIVE555_CONFIG_TARGET) + echo 'CPLUSPLUS_COMPILER = $(TARGET_CXX)' >> $(@D)/config.$(LIVE555_CONFIG_TARGET) + + echo 'LINK = $(TARGET_CXX) -o' >> $(@D)/config.$(LIVE555_CONFIG_TARGET) + echo 'LINK_OPTS = -L. $(TARGET_LDFLAGS)' >> $(@D)/config.$(LIVE555_CONFIG_TARGET) + echo 'PREFIX = /usr' >> $(@D)/config.$(LIVE555_CONFIG_TARGET) + # Must have a whitespace at the end of LIBRARY_LINK, otherwise static link + # fails + echo 'LIBRARY_LINK = $(LIVE555_LIBRARY_LINK) ' >> $(@D)/config.$(LIVE555_CONFIG_TARGET) + (cd $(@D); ./genMakefiles $(LIVE555_CONFIG_TARGET)) endef define LIVE555_BUILD_CMDS $(MAKE) -C $(@D) all endef -LIVE555_HEADERS_TO_INSTALL = \ - liveMedia/include \ - groupsock/include \ - UsageEnvironment/include \ - BasicUsageEnvironment/include - -LIVE555_LIBS_TO_INSTALL = \ - liveMedia/libliveMedia.a \ - groupsock/libgroupsock.a \ - UsageEnvironment/libUsageEnvironment.a \ - BasicUsageEnvironment/libBasicUsageEnvironment.a - LIVE555_FILES_TO_INSTALL-y = LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_OPENRTSP) += testProgs/openRTSP LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_MEDIASERVER) += mediaServer/live555MediaServer LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_MPEG2_INDEXER) += testProgs/MPEG2TransportStreamIndexer define LIVE555_INSTALL_STAGING_CMDS - for i in $(LIVE555_HEADERS_TO_INSTALL); do \ - mkdir -p $(STAGING_DIR)/usr/include/live/`dirname $$i`; \ - cp -a $(@D)/$$i/* $(STAGING_DIR)/usr/include/live/`dirname $$i`; \ - done; \ - for i in $(LIVE555_LIBS_TO_INSTALL); do \ - $(INSTALL) -D -m 0755 $(@D)/$$i $(STAGING_DIR)/usr/lib/`basename $$i`; \ - done + $(MAKE) DESTDIR=$(STAGING_DIR) -C $(@D) install endef define LIVE555_INSTALL_TARGET_CMDS diff --git a/package/lttng-babeltrace/Config.in b/package/lttng-babeltrace/Config.in index ce776d187..3fe1b3ac4 100644 --- a/package/lttng-babeltrace/Config.in +++ b/package/lttng-babeltrace/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_LTTNG_BABELTRACE bool "lttng-babeltrace" - depends on BR2_PACKAGE_LTTNG_TOOLS select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_LIBGLIB2 @@ -27,7 +26,6 @@ config BR2_PACKAGE_LTTNG_BABELTRACE http://lttng.org comment "lttng-babeltrace needs a uclibc snapshot or (e)glib toolchain w/ wchar, threads, largefile" - depends on BR2_PACKAGE_LTTNG_TOOLS depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS \ || !(BR2_UCLIBC_VERSION_SNAPSHOT || BR2_TOOLCHAIN_USES_GLIBC) diff --git a/package/lvm2/lvm2.hash b/package/lvm2/lvm2.hash index 10f290550..adffcdb66 100644 --- a/package/lvm2/lvm2.hash +++ b/package/lvm2/lvm2.hash @@ -1,2 +1,2 @@ # From ftp://sources.redhat.com/pub/lvm2/md5.sum -md5 02487ab2a9e02d1ee76fe217183df28a LVM2.2.02.111.tgz +md5 f71aa8e64030f3d2a3fdabcc36e45094 LVM2.2.02.113.tgz diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 76c2f8278..48a3116de 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LVM2_VERSION = 2.02.111 +LVM2_VERSION = 2.02.113 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz LVM2_SITE = ftp://sources.redhat.com/pub/lvm2/releases LVM2_INSTALL_STAGING = YES diff --git a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk index ebf23e4fd..bdcc32f7f 100644 --- a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk +++ b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk @@ -15,7 +15,7 @@ MATCHBOX_KEYBOARD_DEPENDENCIES = host-pkgconf matchbox-lib matchbox-fakekey expa MATCHBOX_KEYBOARD_CONF_ENV = expat=yes define MATCHBOX_KEYBOARD_POST_INSTALL_FIXES - cp -dpf ./package/matchbox/matchbox-keyboard/mb-applet-kbd-wrapper.sh $(TARGET_DIR)/usr/bin/ + $(INSTALL) -D -m 0755 package/matchbox/matchbox-keyboard/mb-applet-kbd-wrapper.sh $(TARGET_DIR)/usr/bin/mb-applet-kbd-wrapper.sh endef MATCHBOX_KEYBOARD_POST_INSTALL_TARGET_HOOKS += MATCHBOX_KEYBOARD_POST_INSTALL_FIXES diff --git a/package/mcelog/Config.in b/package/mcelog/Config.in new file mode 100644 index 000000000..f3ccc71e8 --- /dev/null +++ b/package/mcelog/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_MCELOG + bool "mcelog" + depends on BR2_i386 || BR2_x86_64 + depends on BR2_USE_MMU # fork() + help + mcelog processes machine checks (in particular memory and CPU hardware + errors) on modern x86 Linux systems. + + http://www.mcelog.org/ diff --git a/package/mcelog/mcelog.mk b/package/mcelog/mcelog.mk new file mode 100644 index 000000000..da338bace --- /dev/null +++ b/package/mcelog/mcelog.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# mcelog +# +################################################################################ + +MCELOG_VERSION = v105 +MCELOG_SITE = $(BR2_KERNEL_MIRROR)/scm/utils/cpu/mce/mcelog.git +MCELOG_SITE_METHOD = git +MCELOG_LICENSE = GPLv2 +MCELOG_LICENSE_FILES = README + +define MCELOG_BUILD_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all +endef + +define MCELOG_INSTALL_TARGET_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) DESTDIR=$(TARGET_DIR) install +endef + +$(eval $(generic-package)) diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 4eaf07c7e..8dfad6cc5 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESA3D_VERSION = 10.3.3 +MESA3D_VERSION = 10.3.4 MESA3D_SOURCE = MesaLib-$(MESA3D_VERSION).tar.bz2 MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION) MESA3D_LICENSE = MIT, SGI, Khronos diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index 3e9117973..f8dc05f0d 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 fee3f3c59b5806767f23f7962621be7a62d4fcb852fff6b9ed6bbb5598a556d3 mpd-0.19.3.tar.xz +sha256 e621e05e7d0e92690f7a1b6ee6f1e502a4d009c69caa4907519282ca571f72cf mpd-0.19.5.tar.xz diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 7061bdbe8..5448251b7 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -5,7 +5,7 @@ ################################################################################ MPD_VERSION_MAJOR = 0.19 -MPD_VERSION = $(MPD_VERSION_MAJOR).3 +MPD_VERSION = $(MPD_VERSION_MAJOR).5 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost libglib2 diff --git a/package/mplayer/mplayer.mk b/package/mplayer/mplayer.mk index dbde97767..b2530e4a1 100644 --- a/package/mplayer/mplayer.mk +++ b/package/mplayer/mplayer.mk @@ -92,7 +92,7 @@ MPLAYER_DEPENDENCIES += live555 MPLAYER_CONF_OPTS += --enable-live MPLAYER_LIVE555 = liveMedia groupsock UsageEnvironment BasicUsageEnvironment MPLAYER_CFLAGS += \ - $(addprefix -I$(STAGING_DIR)/usr/include/live/,$(MPLAYER_LIVE555)) + $(addprefix -I$(STAGING_DIR)/usr/include/,$(MPLAYER_LIVE555)) MPLAYER_LDFLAGS += $(addprefix -l,$(MPLAYER_LIVE555)) -lstdc++ else MPLAYER_CONF_OPTS += --disable-live diff --git a/package/network-manager/S45network-manager b/package/network-manager/S45network-manager index 78808912b..5f32398e6 100755 --- a/package/network-manager/S45network-manager +++ b/package/network-manager/S45network-manager @@ -8,7 +8,7 @@ NETWORKMANAGER_BIN=${sbindir}/NetworkManager [ -x $NETWORKMANAGER_BIN ] || exit 0 -PID=`pidof -o %PPID NetworkManager` +PID=`pidof NetworkManager` case "$1" in start) echo -n "Starting NetworkManager ... " diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 79442543d..9770cae94 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -56,11 +56,11 @@ else endif ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) -NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/usr/sbin/dhclient +NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/sbin/dhclient endif ifeq ($(BR2_PACKAGE_DHCPCD),y) -NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/usr/sbin/dhcpcd +NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd endif # uClibc by default doesn't have backtrace support, so don't use it diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk index 5a65c5226..55ae8442f 100644 --- a/package/nginx/nginx.mk +++ b/package/nginx/nginx.mk @@ -25,7 +25,7 @@ NGINX_CONF_OPTS = \ # So, we just need to create the directories used by nginx with the right # ownership. define NGINX_PERMISSIONS - /var/lib/nginx d 755 33 33 - - - - - + /var/lib/nginx d 755 33 33 - - - - - endef # disable external libatomic_ops because its detection fails. diff --git a/package/omniorb/omniorb.hash b/package/omniorb/omniorb.hash new file mode 100644 index 000000000..d087d958e --- /dev/null +++ b/package/omniorb/omniorb.hash @@ -0,0 +1,3 @@ +# From http://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.2.0/ +sha1 cc52c636f4f329e0481d6bb97b1f0a4bfb21fb3d omniORB-4.2.0.tar.bz2 +md5 f1e104d0a2df92829c1b37a853f4805d omniORB-4.2.0.tar.bz2 diff --git a/package/omniorb/omniorb.mk b/package/omniorb/omniorb.mk index 4767fb11c..25d3b735f 100644 --- a/package/omniorb/omniorb.mk +++ b/package/omniorb/omniorb.mk @@ -4,7 +4,7 @@ # ################################################################################ -OMNIORB_VERSION = 4.1.6 +OMNIORB_VERSION = 4.2.0 OMNIORB_SITE = http://downloads.sourceforge.net/project/omniorb/omniORB/omniORB-$(OMNIORB_VERSION) OMNIORB_SOURCE = omniORB-$(OMNIORB_VERSION).tar.bz2 OMNIORB_INSTALL_STAGING = YES diff --git a/package/openssl/openssl-001-do-not-build-docs.patch b/package/openssl/001-do-not-build-docs.patch similarity index 100% rename from package/openssl/openssl-001-do-not-build-docs.patch rename to package/openssl/001-do-not-build-docs.patch diff --git a/package/openssl/openssl-002-dont-force-large-file.patch b/package/openssl/002-dont-force-large-file.patch similarity index 100% rename from package/openssl/openssl-002-dont-force-large-file.patch rename to package/openssl/002-dont-force-large-file.patch diff --git a/package/openssl/openssl-003-cryptodev-Fix-issue-with-signature-generation.patch b/package/openssl/003-cryptodev-Fix-issue-with-signature-generation.patch similarity index 100% rename from package/openssl/openssl-003-cryptodev-Fix-issue-with-signature-generation.patch rename to package/openssl/003-cryptodev-Fix-issue-with-signature-generation.patch diff --git a/package/openssl/openssl-004-musl-termios.patch b/package/openssl/004-musl-termios.patch similarity index 100% rename from package/openssl/openssl-004-musl-termios.patch rename to package/openssl/004-musl-termios.patch diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 09f9412c5..ad2d1a6f6 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -46,6 +46,48 @@ endef # $(call AUTOCONF_AC_CHECK_FILE_VAL,/dev/random)=yes AUTOCONF_AC_CHECK_FILE_VAL = ac_cv_file_$(subst -,_,$(subst /,_,$(subst .,_,$(1)))) +# +# Hook to update config.sub and config.guess if needed +# +define UPDATE_CONFIG_HOOK + @$(call MESSAGE,"Updating config.sub and config.guess") + $(call CONFIG_UPDATE,$(@D)) +endef + +# +# Hook to patch libtool to make it work properly for cross-compilation +# +define LIBTOOL_PATCH_HOOK + @$(call MESSAGE,"Patching libtool") + $(Q)for i in `find $($(PKG)_SRCDIR) -name ltmain.sh`; do \ + ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$i | \ + sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \ + if test $${ltmain_version} = '1.5'; then \ + $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v1.5.patch; \ + elif test $${ltmain_version} = "2.2"; then\ + $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v2.2.patch; \ + elif test $${ltmain_version} = "2.4"; then\ + $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v2.4.patch; \ + fi \ + done +endef + +# +# Hook to gettextize the package if needed +# +define GETTEXTIZE_HOOK + @$(call MESSAGE,"Gettextizing") + $(Q)cd $($(PKG)_SRCDIR) && $(GETTEXTIZE) $($(PKG)_GETTEXTIZE_OPTS) +endef + +# +# Hook to autoreconf the package if needed +# +define AUTORECONF_HOOK + @$(call MESSAGE,"Autoreconfiguring") + $(Q)cd $($(PKG)_SRCDIR) && $($(PKG)_AUTORECONF_ENV) $(AUTORECONF) $($(PKG)_AUTORECONF_OPTS) +endef + ################################################################################ # inner-autotools-package -- defines how the configuration, compilation and # installation of an autotools package should be done, implements a @@ -111,6 +153,14 @@ $(2)_INSTALL_OPTS ?= install $(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install $(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install +# This must be repeated from inner-generic-package, otherwise we get an empty +# _DEPENDENCIES if _AUTORECONF is YES. Also filter the result of _AUTORECONF +# and _GETTEXTIZE away from the non-host rule +ifeq ($(4),host) +$(2)_DEPENDENCIES ?= $$(filter-out host-automake host-autoconf host-libtool \ + host-gettext host-toolchain $(1),\ + $$(patsubst host-host-%,host-%,$$(addprefix host-,$$($(3)_DEPENDENCIES)))) +endif # # Configure step. Only define it if not already defined by the package @@ -183,88 +233,29 @@ endef endif endif -# -# Hook to update config.sub and config.guess if needed -# -define UPDATE_CONFIG_HOOK - @$$(call MESSAGE,"Updating config.sub and config.guess") - $$(call CONFIG_UPDATE,$$(@D)) -endef - $(2)_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK -# -# Hook to patch libtool to make it work properly for cross-compilation -# -define LIBTOOL_PATCH_HOOK - @$$(call MESSAGE,"Patching libtool") - $$(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES" \ - -a "$$($$(PKG)_AUTORECONF)" != "YES"; then \ - for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \ - ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$$$i | \ - sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \ - if test $$$${ltmain_version} = '1.5'; then \ - $$(APPLY_PATCHES) $$$${i%/*} support/libtool buildroot-libtool-v1.5.patch; \ - elif test $$$${ltmain_version} = "2.2"; then\ - $$(APPLY_PATCHES) $$$${i%/*} support/libtool buildroot-libtool-v2.2.patch; \ - elif test $$$${ltmain_version} = "2.4"; then\ - $$(APPLY_PATCHES) $$$${i%/*} support/libtool buildroot-libtool-v2.4.patch; \ - fi \ - done \ - fi -endef - -# default values are not evaluated yet, so don't rely on this defaulting to YES -ifneq ($$($(2)_LIBTOOL_PATCH),NO) -$(2)_POST_PATCH_HOOKS += LIBTOOL_PATCH_HOOK -endif - -# -# Hook to gettextize the package if needed -# -define GETTEXTIZE_HOOK - @$$(call MESSAGE,"Gettextizing") - $(Q)cd $$($$(PKG)_SRCDIR) && $$(GETTEXTIZE) $$($$(PKG)_GETTEXTIZE_OPTS) -endef - -# -# Hook to autoreconf the package if needed -# -define AUTORECONF_HOOK - @$$(call MESSAGE,"Autoreconfiguring") - $$(Q)cd $$($$(PKG)_SRCDIR) && $$($$(PKG)_AUTORECONF_ENV) $$(AUTORECONF) $$($$(PKG)_AUTORECONF_OPTS) - $$(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES"; then \ - for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \ - ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$$$i | \ - sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \ - if test $$$${ltmain_version} = "1.5"; then \ - $$(APPLY_PATCHES) $$$${i%/*} support/libtool buildroot-libtool-v1.5.patch; \ - elif test $$$${ltmain_version} = "2.2"; then\ - $$(APPLY_PATCHES) $$$${i%/*} support/libtool buildroot-libtool-v2.2.patch; \ - elif test $$$${ltmain_version} = "2.4"; then\ - $$(APPLY_PATCHES) $$$${i%/*} support/libtool buildroot-libtool-v2.4.patch; \ - fi \ - done \ - fi -endef - -# This must be repeated from inner-generic-package, otherwise we get an empty -# _DEPENDENCIES if _AUTORECONF is YES. Also filter the result of _AUTORECONF -# and _GETTEXTIZE away from the non-host rule -ifeq ($(4),host) -$(2)_DEPENDENCIES ?= $$(filter-out host-automake host-autoconf host-libtool \ - host-gettext host-toolchain $(1),\ - $$(patsubst host-host-%,host-%,$$(addprefix host-,$$($(3)_DEPENDENCIES)))) -endif - ifeq ($$($(2)_AUTORECONF),YES) + # This has to come before autoreconf ifeq ($$($(2)_GETTEXTIZE),YES) $(2)_PRE_CONFIGURE_HOOKS += GETTEXTIZE_HOOK $(2)_DEPENDENCIES += host-gettext endif $(2)_PRE_CONFIGURE_HOOKS += AUTORECONF_HOOK +# default values are not evaluated yet, so don't rely on this defaulting to YES +ifneq ($$($(2)_LIBTOOL_PATCH),NO) +$(2)_PRE_CONFIGURE_HOOKS += LIBTOOL_PATCH_HOOK +endif $(2)_DEPENDENCIES += host-automake host-autoconf host-libtool + +else # ! AUTORECONF = YES + +# default values are not evaluated yet, so don't rely on this defaulting to YES +ifneq ($$($(2)_LIBTOOL_PATCH),NO) +$(2)_POST_PATCH_HOOKS += LIBTOOL_PATCH_HOOK +endif + endif # diff --git a/package/python-bottle/Config.in b/package/python-bottle/Config.in index 7b13c1d67..f9b60ca72 100644 --- a/package/python-bottle/Config.in +++ b/package/python-bottle/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_BOTTLE bool "python-bottle" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 help Bottle is a fast, simple and lightweight WSGI micro web-framework for Python. It is distributed as a single file module and has no diff --git a/package/python-certifi/Config.in b/package/python-certifi/Config.in new file mode 100644 index 000000000..9390b4f89 --- /dev/null +++ b/package/python-certifi/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_CERTIFI + bool "python-certifi" + help + Python package for providing Mozilla's CA Bundle. + + https://pypi.python.org/pypi/certifi diff --git a/package/python-certifi/python-certifi.hash b/package/python-certifi/python-certifi.hash new file mode 100644 index 000000000..9277f51a1 --- /dev/null +++ b/package/python-certifi/python-certifi.hash @@ -0,0 +1,2 @@ +sha1 f53dc8f57aaf6d69c183ebadcec52ece0a55cc3f certifi-14.05.14.tar.gz +sha256 1e1bcbacd6357c151ae37cf0290dcc809721d32ce21fd6b7339568f3ddef1b69 certifi-14.05.14.tar.gz diff --git a/package/python-certifi/python-certifi.mk b/package/python-certifi/python-certifi.mk new file mode 100644 index 000000000..f14204169 --- /dev/null +++ b/package/python-certifi/python-certifi.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-certifi +# +################################################################################ + +PYTHON_CERTIFI_VERSION = 14.05.14 +PYTHON_CERTIFI_SOURCE = certifi-$(PYTHON_CERTIFI_VERSION).tar.gz +PYTHON_CERTIFI_SITE = https://pypi.python.org/packages/source/c/certifi +PYTHON_CERTIFI_SETUP_TYPE = setuptools +PYTHON_CERTIFI_LICENSE = ISC (Python code), MPL-2.0 (cacert.pem) +PYTHON_CERTIFI_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-cffi/Config.in b/package/python-cffi/Config.in index f18ed96f6..9cbfcfbbb 100644 --- a/package/python-cffi/Config.in +++ b/package/python-cffi/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_CFFI bool "python-cffi" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_LIBFFI help This is the Foreign Function Interface for Python calling C diff --git a/package/python-configshell-fb/Config.in b/package/python-configshell-fb/Config.in index fb9676381..85f47a83b 100644 --- a/package/python-configshell-fb/Config.in +++ b/package/python-configshell-fb/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_CONFIGSHELL_FB bool "python-configshell-fb" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_PYPARSING select BR2_PACKAGE_PYTHON3_READLINE if BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_READLINE if BR2_PACKAGE_PYTHON diff --git a/package/python-flask/Config.in b/package/python-flask/Config.in new file mode 100644 index 000000000..4a955c458 --- /dev/null +++ b/package/python-flask/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PYTHON_FLASK + bool "python-flask" + select BR2_PACKAGE_PYTHON_WERKZEUG + select BR2_PACKAGE_PYTHON_JINJA2 + select BR2_PACKAGE_PYTHON_ITSDANGEROUS + help + Flask is a microframework for Python based on Werkzeug, + Jinja 2 and good intentions. + + http://flask.pocoo.org/ diff --git a/package/python-flask/python-flask.hash b/package/python-flask/python-flask.hash new file mode 100644 index 000000000..55d0a5c58 --- /dev/null +++ b/package/python-flask/python-flask.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=378670fe456957eb3c27ddaef60b2b24, sha256 locally computed +md5 378670fe456957eb3c27ddaef60b2b24 Flask-0.10.1.tar.gz +sha256 4c83829ff83d408b5e1d4995472265411d2c414112298f2eb4b359d9e4563373 Flask-0.10.1.tar.gz diff --git a/package/python-flask/python-flask.mk b/package/python-flask/python-flask.mk new file mode 100644 index 000000000..d7e3d1fe5 --- /dev/null +++ b/package/python-flask/python-flask.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-flask +# +################################################################################ + +PYTHON_FLASK_VERSION = 0.10.1 +PYTHON_FLASK_SOURCE = Flask-$(PYTHON_FLASK_VERSION).tar.gz +PYTHON_FLASK_SITE = http://pypi.python.org/packages/source/F/Flask +PYTHON_FLASK_SETUP_TYPE = setuptools +PYTHON_FLASK_LICENSE = BSD-3c +PYTHON_FLASK_LICENSE_FILES = LICENSE +PYTHON_FLASH_DEPENDENCIES = python-werkzeug python-jinja2 python-itsdangerous + +$(eval $(python-package)) diff --git a/package/python-httplib2/Config.in b/package/python-httplib2/Config.in new file mode 100644 index 000000000..e42f5132b --- /dev/null +++ b/package/python-httplib2/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PYTHON_HTTPLIB2 + bool "python-httplib2" + select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON + select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON + select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 + help + httplib2 is a comprehensive HTTP client library, httplib2.py + supports many features left out of other HTTP libraries. + + https://pypi.python.org/pypi/httplib2 diff --git a/package/python-httplib2/python-httplib2.hash b/package/python-httplib2/python-httplib2.hash new file mode 100644 index 000000000..6b128d347 --- /dev/null +++ b/package/python-httplib2/python-httplib2.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=09d8e8016911fc40e2e4c58f1aa3ec24, sha256 locally computed +md5 09d8e8016911fc40e2e4c58f1aa3ec24 httplib2-0.9.tar.gz +sha256 39ea8c6a6d9f595c177a16134fc49a990ad8d382758cbf469c8659662f2f51ab httplib2-0.9.tar.gz diff --git a/package/python-httplib2/python-httplib2.mk b/package/python-httplib2/python-httplib2.mk new file mode 100644 index 000000000..ec5c4763e --- /dev/null +++ b/package/python-httplib2/python-httplib2.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-httplib2 +# +################################################################################ + +PYTHON_HTTPLIB2_VERSION = 0.9 +PYTHON_HTTPLIB2_SOURCE = httplib2-$(PYTHON_HTTPLIB2_VERSION).tar.gz +PYTHON_HTTPLIB2_SITE = http://pypi.python.org/packages/source/h/httplib2 +PYTHON_HTTPLIB2_SETUP_TYPE = setuptools +PYTHON_HTTPLIB2_LICENSE = MIT +PYTHON_HTTPLIB2_LICENSE_FILES = PKG-INFO + +$(eval $(python-package)) diff --git a/package/python-ipython/Config.in b/package/python-ipython/Config.in index 064f0c947..1d92873f8 100644 --- a/package/python-ipython/Config.in +++ b/package/python-ipython/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_IPYTHON bool "python-ipython" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 help IPython is a command shell for interactive computing in multiple programming languages, originally developed for the Python diff --git a/package/python-itsdangerous/Config.in b/package/python-itsdangerous/Config.in new file mode 100644 index 000000000..39ec0b772 --- /dev/null +++ b/package/python-itsdangerous/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_ITSDANGEROUS + bool "python-itsdangerous" + select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + help + Itsdangerous contains various helpers to pass data to + untrusted environments and to get it back safe and sound. + + http://pythonhosted.org/itsdangerous/ diff --git a/package/python-itsdangerous/python-itsdangerous.mk b/package/python-itsdangerous/python-itsdangerous.mk new file mode 100644 index 000000000..8b055d6da --- /dev/null +++ b/package/python-itsdangerous/python-itsdangerous.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-itsdangerous +# +################################################################################ + +PYTHON_ITSDANGEROUS_VERSION = 0.24 +PYTHON_ITSDANGEROUS_SITE = $(call github,mitsuhiko,itsdangerous,$(PYTHON_ITSDANGEROUS_VERSION)) +PYTHON_ITSDANGEROUS_SETUP_TYPE = setuptools +PYTHON_ITSDANGEROUS_LICENSE = BSD-3c +PYTHON_ITSDANGEROUS_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-jinja2/Config.in b/package/python-jinja2/Config.in new file mode 100644 index 000000000..a1900e94d --- /dev/null +++ b/package/python-jinja2/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_JINJA2 + bool "python-jinja2" + select BR2_PACKAGE_PYTHON_MARKUPSAFE # runtime + help + Jinja2 is a template engine written in pure Python. It + provides a Django inspired non-XML syntax but supports + inline expressions and an optional sandboxed environment. + + http://jinja.pocoo.org/ diff --git a/package/python-jinja2/python-jinja2.hash b/package/python-jinja2/python-jinja2.hash new file mode 100644 index 000000000..6e8c1603b --- /dev/null +++ b/package/python-jinja2/python-jinja2.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=b9dffd2f3b43d673802fe857c8445b1a, sha256 locally computed +md5 b9dffd2f3b43d673802fe857c8445b1a Jinja2-2.7.3.tar.gz +sha256 2e24ac5d004db5714976a04ac0e80c6df6e47e98c354cb2c0d82f8879d4f8fdb Jinja2-2.7.3.tar.gz diff --git a/package/python-jinja2/python-jinja2.mk b/package/python-jinja2/python-jinja2.mk new file mode 100644 index 000000000..49625e367 --- /dev/null +++ b/package/python-jinja2/python-jinja2.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-jinja2 +# +################################################################################ + +PYTHON_JINJA2_VERSION = 2.7.3 +PYTHON_JINJA2_SOURCE = Jinja2-$(PYTHON_JINJA2_VERSION).tar.gz +PYTHON_JINJA2_SITE = http://pypi.python.org/packages/source/J/Jinja2 +PYTHON_JINJA2_SETUP_TYPE = setuptools +PYTHON_JINJA2_LICENSE = BSD-3c +PYTHON_JINJA2_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-libconfig/Config.in b/package/python-libconfig/Config.in index eae6cdafc..7a49d9159 100644 --- a/package/python-libconfig/Config.in +++ b/package/python-libconfig/Config.in @@ -3,7 +3,6 @@ comment "python-libconfig needs a toolchain w/ C++, largefile, threads" config BR2_PACKAGE_PYTHON_LIBCONFIG bool "python-libconfig" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_PYTHON select BR2_PACKAGE_LIBCONFIG diff --git a/package/python-markupsafe/Config.in b/package/python-markupsafe/Config.in new file mode 100644 index 000000000..48421e0a3 --- /dev/null +++ b/package/python-markupsafe/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_MARKUPSAFE + bool "python-markupsafe" + help + MarkupSafe implements a XML/HTML/XHTML Markup safe string + for Python. + + https://github.com/mitsuhiko/markupsafe diff --git a/package/python-markupsafe/python-markupsafe.hash b/package/python-markupsafe/python-markupsafe.hash new file mode 100644 index 000000000..448252b0d --- /dev/null +++ b/package/python-markupsafe/python-markupsafe.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=f5ab3deee4c37cd6a922fb81e730da6e, sha256 locally computed +md5 f5ab3deee4c37cd6a922fb81e730da6e MarkupSafe-0.23.tar.gz +sha256 a4ec1aff59b95a14b45eb2e23761a0179e98319da5a7eb76b56ea8cdc7b871c3 MarkupSafe-0.23.tar.gz diff --git a/package/python-markupsafe/python-markupsafe.mk b/package/python-markupsafe/python-markupsafe.mk new file mode 100644 index 000000000..9c7eb14c9 --- /dev/null +++ b/package/python-markupsafe/python-markupsafe.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-markupsafe +# +################################################################################ + +PYTHON_MARKUPSAFE_VERSION = 0.23 +PYTHON_MARKUPSAFE_SOURCE = MarkupSafe-$(PYTHON_MARKUPSAFE_VERSION).tar.gz +PYTHON_MARKUPSAFE_SITE = http://pypi.python.org/packages/source/M/MarkupSafe +PYTHON_MARKUPSAFE_SETUP_TYPE = setuptools +PYTHON_MARKUPSAFE_LICENSE = BSD-3c +PYTHON_MARKUPSAFE_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-netifaces/Config.in b/package/python-netifaces/Config.in index 29f9fc33a..1f54f4bd1 100644 --- a/package/python-netifaces/Config.in +++ b/package/python-netifaces/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_NETIFACES bool "python-netifaces" - depends on BR2_PACKAGE_PYTHON help Portable access to network interfaces from Python. diff --git a/package/python-networkmanager/Config.in b/package/python-networkmanager/Config.in new file mode 100644 index 000000000..fcbce5748 --- /dev/null +++ b/package/python-networkmanager/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_PYTHON_NETWORKMANAGER + bool "python-networkmanager" + depends on BR2_PACKAGE_NETWORK_MANAGER # runtime + depends on BR2_USE_WCHAR # dbus-python + depends on BR2_TOOLCHAIN_HAS_THREADS # dbus-python + depends on BR2_PACKAGE_DBUS # dbus-python + select BR2_PACKAGE_DBUS_PYTHON + help + python-networkmanager wraps NetworkManagers D-Bus interface + so you can be less verbose when talking to NetworkManager + from python. All interfaces have been wrapped in classes, + properties are exposed as python properties and function + calls are forwarded to the correct interface. + + https://pypi.python.org/pypi/python-networkmanager/ diff --git a/package/python-networkmanager/python-networkmanager.hash b/package/python-networkmanager/python-networkmanager.hash new file mode 100644 index 000000000..6c6f69722 --- /dev/null +++ b/package/python-networkmanager/python-networkmanager.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=2cd400a7ca4dcd1ea98c864007032494, sha256 locally computed +md5 2cd400a7ca4dcd1ea98c864007032494 python-networkmanager-0.9.12.tar.gz +sha256 a4c7bbae8a1ee3cf370ff0cd2ba2e0f1fb7f8e8f99f8f48a1df624c19a11166f python-networkmanager-0.9.12.tar.gz diff --git a/package/python-networkmanager/python-networkmanager.mk b/package/python-networkmanager/python-networkmanager.mk new file mode 100644 index 000000000..c043edb3f --- /dev/null +++ b/package/python-networkmanager/python-networkmanager.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-networkmanager +# +################################################################################ + +PYTHON_NETWORKMANAGER_VERSION = 0.9.12 +PYTHON_NETWORKMANAGER_SITE = http://pypi.python.org/packages/source/p/python-networkmanager +PYTHON_NETWORKMANAGER_SETUP_TYPE = distutils +PYTHON_NETWORKMANAGER_LICENSE = GPLv3+ +PYTHON_NETWORKMANAGER_LICENSE_FILES = COPYING +PYTHON_NETWORKMANAGER_DEPENDENCIES = dbus-python + +$(eval $(python-package)) diff --git a/package/python-pyasn/Config.in b/package/python-pyasn/Config.in index efdbbc59d..997b737f5 100644 --- a/package/python-pyasn/Config.in +++ b/package/python-pyasn/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYASN bool "python-pyasn" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON diff --git a/package/python-pycrypto/Config.in b/package/python-pycrypto/Config.in index fe545b5f6..e998ecf89 100644 --- a/package/python-pycrypto/Config.in +++ b/package/python-pycrypto/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYCRYPTO bool "python-pycrypto" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_GMP help PyCrypto is a collection of cryptographic algorithms and diff --git a/package/python-pyparsing/Config.in b/package/python-pyparsing/Config.in index 0408e5e44..b926286cc 100644 --- a/package/python-pyparsing/Config.in +++ b/package/python-pyparsing/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYPARSING bool "python-pyparsing" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 help The pyparsing module is an alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, diff --git a/package/python-pysnmp-apps/Config.in b/package/python-pysnmp-apps/Config.in index 8edd04c55..b032eba1f 100644 --- a/package/python-pysnmp-apps/Config.in +++ b/package/python-pysnmp-apps/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYSNMP_APPS bool "python-pysnmp-apps" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_PYSNMP depends on BR2_INSTALL_LIBSTDCPP # pysnmp -> pyasn help diff --git a/package/python-pysnmp-mibs/Config.in b/package/python-pysnmp-mibs/Config.in index cc03676a3..eca17d26a 100644 --- a/package/python-pysnmp-mibs/Config.in +++ b/package/python-pysnmp-mibs/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYSNMP_MIBS bool "python-pysnmp-mibs" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_PYSNMP depends on BR2_INSTALL_LIBSTDCPP # pysnmp -> pyasn help diff --git a/package/python-pysnmp/Config.in b/package/python-pysnmp/Config.in index 6cf18ee06..c7cdf3892 100644 --- a/package/python-pysnmp/Config.in +++ b/package/python-pysnmp/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYSNMP bool "python-pysnmp" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 depends on BR2_INSTALL_LIBSTDCPP # pyasn select BR2_PACKAGE_PYTHON_PYASN select BR2_PACKAGE_PYTHON_PYCRYPTO diff --git a/package/python-requests/Config.in b/package/python-requests/Config.in new file mode 100644 index 000000000..3367cf070 --- /dev/null +++ b/package/python-requests/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_REQUESTS + bool "python-requests" + help + Requests is an Apache2 Licensed HTTP library, written in + Python, for human beings. + + http://www.python-requests.org/ diff --git a/package/python-requests/python-requests.hash b/package/python-requests/python-requests.hash new file mode 100644 index 000000000..d187dcd2a --- /dev/null +++ b/package/python-requests/python-requests.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=02214b3a179e445545de4b7a98d3dd17, sha256 locally computed +md5 02214b3a179e445545de4b7a98d3dd17 requests-2.4.3.tar.gz +sha256 53c68313c5c6149b1a899234c000296e60a8900682accf73d6f0c6d608afc6b1 requests-2.4.3.tar.gz diff --git a/package/python-requests/python-requests.mk b/package/python-requests/python-requests.mk new file mode 100644 index 000000000..5c12f1b56 --- /dev/null +++ b/package/python-requests/python-requests.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-requests +# +################################################################################ + +PYTHON_REQUESTS_VERSION = 2.4.3 +PYTHON_REQUESTS_SOURCE = requests-$(PYTHON_REQUESTS_VERSION).tar.gz +PYTHON_REQUESTS_SITE = http://pypi.python.org/packages/source/r/requests +PYTHON_REQUESTS_SETUP_TYPE = setuptools +PYTHON_REQUESTS_LICENSE = Apache-2.0 +PYTHON_REQUESTS_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-rtslib-fb/Config.in b/package/python-rtslib-fb/Config.in index 119b63bf1..42a610cc5 100644 --- a/package/python-rtslib-fb/Config.in +++ b/package/python-rtslib-fb/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_RTSLIB_FB bool "python-rtslib-fb" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 help rtslib-fb is an object-based Python library for configuring the LIO generic SCSI target, present in 3.x Linux kernel diff --git a/package/python-serial/Config.in b/package/python-serial/Config.in index 72f556756..09a4c3925 100644 --- a/package/python-serial/Config.in +++ b/package/python-serial/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_SERIAL bool "python-serial" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 help python-serial is a Python library to access serial ports. diff --git a/package/python-urwid/Config.in b/package/python-urwid/Config.in index 92f7d53d2..f584a9258 100644 --- a/package/python-urwid/Config.in +++ b/package/python-urwid/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_URWID bool "python-urwid" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 help Urwid is a console user interface library for Python diff --git a/package/python-webpy/Config.in b/package/python-webpy/Config.in new file mode 100644 index 000000000..1e90892d2 --- /dev/null +++ b/package/python-webpy/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_WEBPY + bool "python-webpy" + help + web.py is a web framework for Python that is as simple as it is + powerful. + + http://webpy.org/ diff --git a/package/python-webpy/python-webpy.mk b/package/python-webpy/python-webpy.mk new file mode 100644 index 000000000..ef5b6b3d7 --- /dev/null +++ b/package/python-webpy/python-webpy.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-webpy +# +################################################################################ + +PYTHON_WEBPY_VERSION = 0.37 +PYTHON_WEBPY_SITE = $(call github,webpy,webpy,webpy-$(PYTHON_WEBPY_VERSION)) +PYTHON_WEBPY_SETUP_TYPE = distutils +PYTHON_WEBPY_LICENSE = Public Domain, CherryPy License +PYTHON_WEBPY_LICENSE_FILES = LICENSE.txt web/wsgiserver/LICENSE.txt + +$(eval $(python-package)) diff --git a/package/python-werkzeug/Config.in b/package/python-werkzeug/Config.in new file mode 100644 index 000000000..79e9a4561 --- /dev/null +++ b/package/python-werkzeug/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_WERKZEUG + bool "python-werkzeug" + select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime + help + Werkzeug is a WSGI utility library for Python. It's widely + used and BSD licensed. + + http://werkzeug.pocoo.org/ diff --git a/package/python-werkzeug/python-werkzeug.hash b/package/python-werkzeug/python-werkzeug.hash new file mode 100644 index 000000000..38f622aea --- /dev/null +++ b/package/python-werkzeug/python-werkzeug.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=f7afcadc03b0f2267bdc156c34586043, sha256 locally computed +md5 f7afcadc03b0f2267bdc156c34586043 Werkzeug-0.9.6.tar.gz +sha256 7f11e7e2e73eb22677cac1b11113eb6106f66cedef13d140e83cf6563c90b79c Werkzeug-0.9.6.tar.gz diff --git a/package/python-werkzeug/python-werkzeug.mk b/package/python-werkzeug/python-werkzeug.mk new file mode 100644 index 000000000..8902d1709 --- /dev/null +++ b/package/python-werkzeug/python-werkzeug.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-werkzeug +# +################################################################################ + +PYTHON_WERKZEUG_VERSION = 0.9.6 +PYTHON_WERKZEUG_SOURCE = Werkzeug-$(PYTHON_WERKZEUG_VERSION).tar.gz +PYTHON_WERKZEUG_SITE = http://pypi.python.org/packages/source/W/Werkzeug +PYTHON_WERKZEUG_SETUP_TYPE = setuptools +PYTHON_WERKZEUG_LICENSE = BSD-3c +PYTHON_WERKZEUG_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python3/python3-017-python-config-include-libdir.patch b/package/python3/python3-017-python-config-include-libdir.patch new file mode 100644 index 000000000..50a856da4 --- /dev/null +++ b/package/python3/python3-017-python-config-include-libdir.patch @@ -0,0 +1,60 @@ +From 50f34d2cac63b6bf0935294a7d63d9451714f4c4 Mon Sep 17 00:00:00 2001 +From: Peter Korsgaard +Date: Thu, 20 Nov 2014 13:24:59 +0100 +Subject: [PATCH] Misc/python-config.sh.in: ensure sed invocations only match + beginning of strings + +The build/real prefix handling using sed breaks if build != real and the +standard include / lib directories are used ($prefix/include and $prefix/lib). + +E.G. + +prefix_build="/usr", libdir="$prefix/lib", includedir="$prefix/include". + +If this gets installed with make DESTDIR="/foo" install, then we end up with +prefix_real = prefix = "/foo/usr" as expected, but +includedir="/foo/foo/usr/include" and libdir="/foo/foo/usr/lib" because of +the double sed invocation (prefix is already expanded). Work around it by +ensuring we only match the beginning of the string. + +Submitted upstream: http://bugs.python.org/issue22907 + +Signed-off-by: Peter Korsgaard +--- + Misc/python-config.sh.in | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in +index 64c81e5..f75eec5 100644 +--- a/Misc/python-config.sh.in ++++ b/Misc/python-config.sh.in +@@ -29,12 +29,12 @@ prefix_real=$(installed_prefix "$0") + + # Use sed to fix paths from their built-to locations to their installed-to + # locations. +-prefix=$(echo "$prefix_build" | sed "s#$prefix_build#$prefix_real#") ++prefix=$(echo "$prefix_build" | sed "s#^$prefix_build#$prefix_real#") + exec_prefix_build="@exec_prefix@" +-exec_prefix=$(echo "$exec_prefix_build" | sed "s#$exec_prefix_build#$prefix_real#") +-includedir=$(echo "@includedir@" | sed "s#$prefix_build#$prefix_real#") +-libdir=$(echo "@libdir@" | sed "s#$prefix_build#$prefix_real#") +-CFLAGS=$(echo "@CFLAGS@" | sed "s#$prefix_build#$prefix_real#") ++exec_prefix=$(echo "$exec_prefix_build" | sed "s#^$exec_prefix_build#$prefix_real#") ++includedir=$(echo "@includedir@" | sed "s#^$prefix_build#$prefix_real#") ++libdir=$(echo "@libdir@" | sed "s#^$prefix_build#$prefix_real#") ++CFLAGS=$(echo "@CFLAGS@" | sed "s#^$prefix_build#$prefix_real#") + VERSION="@VERSION@" + LIBM="@LIBM@" + LIBC="@LIBC@" +@@ -48,7 +48,7 @@ OPT="@OPT@" + PY_ENABLE_SHARED="@PY_ENABLE_SHARED@" + LDVERSION="@LDVERSION@" + LIBDEST=${prefix}/lib/python${VERSION} +-LIBPL=$(echo "@LIBPL@" | sed "s#$prefix_build#$prefix_real#") ++LIBPL=$(echo "@LIBPL@" | sed "s#^$prefix_build#$prefix_real#") + SO="@SO@" + PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" + INCDIR="-I$includedir/python${VERSION}${ABIFLAGS}" +-- +2.1.3 + diff --git a/package/rapidjson/rapidjson.mk b/package/rapidjson/rapidjson.mk index 68e010ede..6658da25f 100644 --- a/package/rapidjson/rapidjson.mk +++ b/package/rapidjson/rapidjson.mk @@ -4,27 +4,15 @@ # ################################################################################ -RAPIDJSON_VERSION = 0.11 -RAPIDJSON_SOURCE = rapidjson-$(RAPIDJSON_VERSION).zip -RAPIDJSON_SITE = http://rapidjson.googlecode.com/files +RAPIDJSON_VERSION = 39f5eeb764c6d1e1cbff1717410d9710bf943009 +RAPIDJSON_SITE = $(call github,miloyip,rapidjson,$(RAPIDJSON_VERSION)) RAPIDJSON_LICENSE = MIT RAPIDJSON_LICENSE_FILES = license.txt RAPIDJSON_INSTALL_TARGET = NO RAPIDJSON_INSTALL_STAGING = YES -define RAPIDJSON_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(DL_DIR)/$(RAPIDJSON_SOURCE) - mv $(@D)/rapidjson/* $(@D) - $(RM) -r $(@D)/rapidjson -endef - define RAPIDJSON_INSTALL_STAGING_CMDS - $(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/rapidjson - $(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/rapidjson/internal - $(INSTALL) -m 0644 $(@D)/include/rapidjson/*.h \ - $(STAGING_DIR)/usr/include/rapidjson - $(INSTALL) -m 0644 $(@D)/include/rapidjson/internal/*.h \ - $(STAGING_DIR)/usr/include/rapidjson/internal + cp -dpfr $(@D)/include/* $(STAGING_DIR)/usr/include endef $(eval $(generic-package)) diff --git a/package/rng-tools/Config.in b/package/rng-tools/Config.in index c50a8c084..43c5a1c2e 100644 --- a/package/rng-tools/Config.in +++ b/package/rng-tools/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_RNG_TOOLS bool "rng-tools" select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC + # For rdrand ligcrypt is required and it's not obvious to users + select BR2_PACKAGE_LIBGCRYPT if BR2_i386 || BR2_x86_64 help Daemon to use hardware random number generators. diff --git a/package/rng-tools/rng-tools.hash b/package/rng-tools/rng-tools.hash new file mode 100644 index 000000000..09769e462 --- /dev/null +++ b/package/rng-tools/rng-tools.hash @@ -0,0 +1,3 @@ +# From http://sourceforge.net/projects/gkernel/files/rng-tools/5/ +md5 6726cdc6fae1f5122463f24ae980dd68 rng-tools-5.tar.gz +sha1 3092768ac45315a5dcc0170d05566d1d00dbad96 rng-tools-5.tar.gz diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/rng-tools.mk index 56858e7ea..5b89656e0 100644 --- a/package/rng-tools/rng-tools.mk +++ b/package/rng-tools/rng-tools.mk @@ -4,13 +4,21 @@ # ################################################################################ -RNG_TOOLS_VERSION = 4 +RNG_TOOLS_VERSION = 5 RNG_TOOLS_SITE = http://downloads.sourceforge.net/project/gkernel/rng-tools/$(RNG_TOOLS_VERSION) -ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -RNG_TOOLS_CONF_ENV = LIBS="-largp" -RNG_TOOLS_DEPENDENCIES = argp-standalone -endif RNG_TOOLS_LICENSE = GPLv2 RNG_TOOLS_LICENSE_FILES = COPYING +# Work around for uClibc's lack of argp_*() functions +ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) +RNG_TOOLS_CONF_ENV += LIBS="-largp" +RNG_TOOLS_DEPENDENCIES += argp-standalone +endif + +ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +RNG_TOOLS_DEPENDENCIES += libgcrypt +else +RNG_TOOLS_CONF_OPTS += --without-libgcrypt +endif + $(eval $(autotools-package)) diff --git a/package/samba/Config.in b/package/samba/Config.in index 8dd0bf2b4..e2cac9e94 100644 --- a/package/samba/Config.in +++ b/package/samba/Config.in @@ -240,6 +240,25 @@ config BR2_PACKAGE_SAMBA_LIBSMBCLIENT standards POSIX functions available for manipulating local files. +config BR2_PACKAGE_SAMBA_LIBNSS_WINS + bool "libnss_wins" + default y + depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_PACKAGE_SAMBA_WINBINDD + help + libnss_wins is a library that permits the Name Service Switch + to resolve NetBIOS names. + +config BR2_PACKAGE_SAMBA_LIBNSS_WINBIND + bool "libnss_winbind" + default y + depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_PACKAGE_SAMBA_WINBINDD + help + libnss_winbind is a library that permits the Name Service + Switch to resolve user and group information from a Windows + NT server. + endmenu diff --git a/package/samba/samba.mk b/package/samba/samba.mk index 19579978c..ec8e6ecb7 100644 --- a/package/samba/samba.mk +++ b/package/samba/samba.mk @@ -135,6 +135,22 @@ endef SAMBA_POST_INSTALL_TARGET_HOOKS += SAMBA_REMOVE_UNNEEDED_BINARIES +ifeq ($(BR2_PACKAGE_SAMBA_LIBNSS_WINS),y) +define SAMBA_INSTALL_LIBNSS_WINS + $(INSTALL) -m 0755 -D $(@D)/nsswitch/libnss_wins.so $(TARGET_DIR)/lib/libnss_wins.so + ln -snf libnss_wins.so $(TARGET_DIR)/lib/libnss_wins.so.2 +endef +SAMBA_POST_INSTALL_TARGET_HOOKS += SAMBA_INSTALL_LIBNSS_WINS +endif + +ifeq ($(BR2_PACKAGE_SAMBA_LIBNSS_WINBIND),y) +define SAMBA_INSTALL_LIBNSS_WINBIND + $(INSTALL) -m 0755 -D $(@D)/nsswitch/libnss_winbind.so $(TARGET_DIR)/lib/libnss_winbind.so + ln -snf libnss_winbind.so $(TARGET_DIR)/lib/libnss_winbind.so.2 +endef +SAMBA_POST_INSTALL_TARGET_HOOKS += SAMBA_INSTALL_LIBNSS_WINBIND +endif + define SAMBA_REMOVE_SWAT_DOCUMENTATION # Remove the documentation rm -rf $(TARGET_DIR)/usr/swat/help/manpages diff --git a/package/sg3_utils/sg3_utils.hash b/package/sg3_utils/sg3_utils.hash new file mode 100644 index 000000000..d3ae1a00e --- /dev/null +++ b/package/sg3_utils/sg3_utils.hash @@ -0,0 +1,2 @@ +# Locally calculated from download (no sig, hash) +sha256 901ece577d797a8a3870881fe765f6eac4bb381b99a1f7311551689e9f17130b sg3_utils-1.40.tar.xz diff --git a/package/sg3_utils/sg3_utils.mk b/package/sg3_utils/sg3_utils.mk index d59d26c10..dca0f6bf8 100644 --- a/package/sg3_utils/sg3_utils.mk +++ b/package/sg3_utils/sg3_utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -SG3_UTILS_VERSION = 1.39 +SG3_UTILS_VERSION = 1.40 SG3_UTILS_SOURCE = sg3_utils-$(SG3_UTILS_VERSION).tar.xz SG3_UTILS_SITE = http://sg.danny.cz/sg/p SG3_UTILS_LICENSE = BSD-3c @@ -27,10 +27,10 @@ define SG3_UTILS_REMOVE_PROGS raw rbuf rdac read readcap read_block_limits \ read_buffer read_long reassign referrals \ rep_zones requests reset reset_wp rmsn rtpg safte sanitize \ - sat_identify sat_phy_event sat_set_features scan \ - senddiag ses start stpg sync test_rwbuf turs \ - unmap verify vpd write_buffer write_long \ - write_same wr_mode xcopy; do \ + sat_identify sat_phy_event sat_read_gplog sat_set_features \ + scan senddiag ses ses_microcode start stpg sync test_rwbuf \ + turs unmap verify vpd write_buffer write_long \ + write_same write_verify wr_mode xcopy; do \ $(RM) $(TARGET_DIR)/usr/bin/sg_$${prog} ; \ done for prog in \ diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk index dc5d09207..39017a06a 100644 --- a/package/shairport-sync/shairport-sync.mk +++ b/package/shairport-sync/shairport-sync.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHAIRPORT_SYNC_VERSION = 2.1.8 +SHAIRPORT_SYNC_VERSION = 2.1.11 SHAIRPORT_SYNC_SITE = $(call github,mikebrady,shairport-sync,$(SHAIRPORT_SYNC_VERSION)) SHAIRPORT_SYNC_LICENSE = MIT, BSD-3c diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index ad1b6c524..26516c992 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,2 +1,2 @@ # From http://www.sqlite.org/download.html -sha1 5601be1263842209d7c5dbf6128f1cc0b6bbe2e5 sqlite-autoconf-3080701.tar.gz +sha1 175283383d010709f76fdd13cb0c8c3c329a1c67 sqlite-autoconf-3080702.tar.gz diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index ea8407ca9..aba788eb7 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQLITE_VERSION = 3080701 +SQLITE_VERSION = 3080702 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz SQLITE_SITE = http://www.sqlite.org/2014 SQLITE_LICENSE = Public domain diff --git a/package/squid/squid.mk b/package/squid/squid.mk index e8a2ccc1a..306b2a361 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -26,7 +26,11 @@ SQUID_CONF_OPTS = --enable-async-io=8 --enable-linux-netfilter \ --enable-auth-negotiate="wrapper" \ --enable-auth-ntlm="fake" \ --disable-strict-error-checking \ - --enable-external-acl-helpers="file_userip" + --enable-external-acl-helpers="file_userip" \ + --with-logdir=/var/log/squid/ \ + --with-pidfile=/var/run/squid.pid \ + --with-swapdir=/var/cache/squid/ \ + --enable-icap-client # On uClibc librt needs libpthread ifeq ($(BR2_TOOLCHAIN_HAS_THREADS)$(BR2_TOOLCHAIN_USES_UCLIBC),yy) diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index 283a40ca6..61635ecca 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -29,7 +29,7 @@ endef SUDO_POST_CONFIGURE_HOOKS += SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST define SUDO_PERMISSIONS - /usr/bin/sudo f 4755 0 0 - - - - - + /usr/bin/sudo f 4755 0 0 - - - - - endef $(eval $(autotools-package)) diff --git a/package/systemd/0004-Properly-define-the-__NR_memfd_create-macro-for-MIPS.patch b/package/systemd/0004-Properly-define-the-__NR_memfd_create-macro-for-MIPS.patch index 6aca13ced..9ce64c92e 100644 --- a/package/systemd/0004-Properly-define-the-__NR_memfd_create-macro-for-MIPS.patch +++ b/package/systemd/0004-Properly-define-the-__NR_memfd_create-macro-for-MIPS.patch @@ -1,16 +1,16 @@ Properly define the __NR_memfd_create macro for MIPS This is an upstream patch which has been applied to the master branch -and I have adapted it to make it apply to the v216 version. +and I have adapted it to make it apply to the v217 version. Upstream commit: http://cgit.freedesktop.org/systemd/systemd/commit/?id=e6c019026b8cfd27a997e6e6ed1349f8f289b7e2 Signed-off-by: Vicente Olivert Riera -From cdd25569e583ccfff3aef0eda175a2d07c00f859 Mon Sep 17 00:00:00 2001 +From a51496db6edc8168268c86ea55915405f95b0212 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera -Date: Tue, 4 Nov 2014 10:49:58 +0000 +Date: Thu, 13 Nov 2014 17:32:52 +0000 Subject: [PATCH] Properly define the __NR_memfd_create macro for MIPS This macro exists for MIPS since v3.17: @@ -18,43 +18,31 @@ This macro exists for MIPS since v3.17: Signed-off-by: Vicente Olivert Riera --- - src/shared/missing.h | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) + src/shared/missing.h | 11 +++++++++-- + 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/shared/missing.h b/src/shared/missing.h -index 3ff1a21..6888163 100644 +index bb4f8f2..66bedcf 100644 --- a/src/shared/missing.h +++ b/src/shared/missing.h -@@ -152,6 +152,9 @@ static inline int pivot_root(const char *new_root, const char *put_old) { - # ifndef __NR_fanotify_mark - # define __NR_fanotify_mark 4337 - # endif -+# ifndef __NR_memfd_create +@@ -125,8 +125,15 @@ static inline int pivot_root(const char *new_root, const char *put_old) { + # endif + #elif defined _MIPS_SIM + # ifndef __NR_memfd_create +-# warning "__NR_memfd_create not yet defined for MIPS" +-# define __NR_memfd_create 0xffffffff ++# if _MIPS_SIM == _MIPS_SIM_ABI32 +# define __NR_memfd_create 4354 +# endif - # elif _MIPS_SIM == _MIPS_SIM_NABI32 - # ifndef __NR_fanotify_init - # define __NR_fanotify_init 6300 -@@ -159,6 +162,9 @@ static inline int pivot_root(const char *new_root, const char *put_old) { - # ifndef __NR_fanotify_mark - # define __NR_fanotify_mark 6301 - # endif -+# ifndef __NR_memfd_create ++# if _MIPS_SIM == _MIPS_SIM_NABI32 +# define __NR_memfd_create 6318 +# endif - # elif _MIPS_SIM == _MIPS_SIM_ABI64 - # ifndef __NR_fanotify_init - # define __NR_fanotify_init 5295 -@@ -166,6 +172,9 @@ static inline int pivot_root(const char *new_root, const char *put_old) { - # ifndef __NR_fanotify_mark - # define __NR_fanotify_mark 5296 - # endif -+# ifndef __NR_memfd_create ++# if _MIPS_SIM == _MIPS_SIM_ABI64 +# define __NR_memfd_create 5314 +# endif # endif #else - # ifndef __NR_fanotify_init + # ifndef __NR_memfd_create -- 1.7.1 diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash new file mode 100644 index 000000000..5b7ba7fb1 --- /dev/null +++ b/package/systemd/systemd.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 a031e6fbcdc7077b37338bae8074d9428ee2fa98033beb4923a62871890f7498 systemd-217.tar.xz diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 75a32f48b..536231922 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSTEMD_VERSION = 216 +SYSTEMD_VERSION = 217 SYSTEMD_SITE = http://www.freedesktop.org/software/systemd SYSTEMD_SOURCE = systemd-$(SYSTEMD_VERSION).tar.xz SYSTEMD_LICENSE = LGPLv2.1+; GPLv2+ for udev; MIT-like license for few source files listed in README diff --git a/package/tcl/tcl.hash b/package/tcl/tcl.hash index e1b338934..2d4e99504 100644 --- a/package/tcl/tcl.hash +++ b/package/tcl/tcl.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 86f7ae5f581dd0904d04415637ab3aef5a50986c1b6d04c340e2b1b0258da9c4 tcl8.6.2-src.tar.gz +sha256 6ce0778de0d50daaa9c345d7c1fd1288fb658f674028812e7eeee992e3051005 tcl8.6.3-src.tar.gz diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk index 244077224..ef0983be3 100644 --- a/package/tcl/tcl.mk +++ b/package/tcl/tcl.mk @@ -5,7 +5,7 @@ ################################################################################ TCL_VERSION_MAJOR = 8.6 -TCL_VERSION = $(TCL_VERSION_MAJOR).2 +TCL_VERSION = $(TCL_VERSION_MAJOR).3 TCL_SOURCE = tcl$(TCL_VERSION)-src.tar.gz TCL_SITE = http://downloads.sourceforge.net/project/tcl/Tcl/$(TCL_VERSION) TCL_LICENSE = tcl license diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 0fd6eea89..f593b3f00 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -4,11 +4,11 @@ # ################################################################################ -TVHEADEND_VERSION = c053acd84e5cc48a3e70047f228728bf039cfacd +TVHEADEND_VERSION = fcd16fa0d835d7fd4f57c350ed8b76350440c68c TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) TVHEADEND_LICENSE = GPLv3+ TVHEADEND_LICENSE_FILES = LICENSE.md -TVHEADEND_DEPENDENCIES = host-pkgconf host-python openssl +TVHEADEND_DEPENDENCIES = host-pkgconf $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) openssl ifeq ($(BR2_PACKAGE_AVAHI),y) TVHEADEND_DEPENDENCIES += avahi @@ -32,21 +32,27 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y) TVHEADEND_DEPENDENCIES += libiconv endif +ifeq ($(BR2_PACKAGE_LIBURIPARSER),y) +TVHEADEND_DEPENDENCIES += liburiparser +TVHEADEND_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) $(if $(BR2_USE_WCHAR),,-DURI_NO_UNICODE)" +endif + TVHEADEND_DEPENDENCIES += dtv-scan-tables define TVHEADEND_CONFIGURE_CMDS - (cd $(@D); \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - ./configure \ - --prefix=/usr \ - --arch="$(ARCH)" \ - --cpu="$(BR2_GCC_TARGET_CPU)" \ - --python="$(HOST_DIR)/usr/bin/python2" \ - --disable-dvbscan \ - --enable-bundle \ - --disable-libffmpeg_static \ - $(TVHEADEND_CONF_OPTS) \ + (cd $(@D); \ + $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ + $(TVHEADEND_CONF_ENV) \ + ./configure \ + --prefix=/usr \ + --arch="$(ARCH)" \ + --cpu="$(BR2_GCC_TARGET_CPU)" \ + --python="$(HOST_DIR)/usr/bin/python" \ + --disable-dvbscan \ + --enable-bundle \ + --disable-libffmpeg_static \ + $(TVHEADEND_CONF_OPTS) \ ) endef diff --git a/package/valgrind/Config.in b/package/valgrind/Config.in index b7521b021..558d5f07b 100644 --- a/package/valgrind/Config.in +++ b/package/valgrind/Config.in @@ -1,12 +1,13 @@ config BR2_PACKAGE_VALGRIND bool "valgrind" - depends on BR2_i386 || BR2_x86_64 || BR2_ARM_CPU_ARMV7A || \ - BR2_powerpc || BR2_mips || BR2_mipsel || BR2_mips64 || \ - BR2_mips64el + depends on BR2_ARM_CPU_ARMV7A || BR2_i386 || \ + BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \ + BR2_powerpc || BR2_powerpc64 || BR2_powerpc64el || \ + BR2_x86_64 help Tool for debugging and profiling Linux programs. - http://valgrind.kde.org/ + http://valgrind.org/ if BR2_PACKAGE_VALGRIND diff --git a/package/valgrind/valgrind.hash b/package/valgrind/valgrind.hash new file mode 100644 index 000000000..f311ea48c --- /dev/null +++ b/package/valgrind/valgrind.hash @@ -0,0 +1,2 @@ +# From http://valgrind.org/downloads/current.html +md5 60ddae962bc79e7c95cfc4667245707f valgrind-3.10.1.tar.bz2 diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk index b65e0488f..aaca39f2a 100644 --- a/package/valgrind/valgrind.mk +++ b/package/valgrind/valgrind.mk @@ -4,7 +4,7 @@ # ################################################################################ -VALGRIND_VERSION = 3.10.0 +VALGRIND_VERSION = 3.10.1 VALGRIND_SITE = http://valgrind.org/downloads VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2 VALGRIND_LICENSE = GPLv2 GFDLv1.2 diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index 7e81d590e..19f1058df 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -224,18 +224,15 @@ else VLC_CONF_OPTS += --disable-libxml2 endif -# live555 installs a static library only, and vlc tries to link it into a -# shared library - which doesn't work. So only enable live555 if static. -ifeq ($(BR2_PACKAGE_LIVE555)$(BR2_PREFER_STATIC_LIB),yy) +ifeq ($(BR2_PACKAGE_LIVE555),y) VLC_CONF_OPTS += --enable-live555 VLC_DEPENDENCIES += live555 VLC_CONF_ENV += \ LIVE555_CFLAGS="\ - -I$(STAGING_DIR)/usr/include/live \ - -I$(STAGING_DIR)/usr/include/live/BasicUsageEnvironment \ - -I$(STAGING_DIR)/usr/include/live/groupsock \ - -I$(STAGING_DIR)/usr/include/live/liveMedia \ - -I$(STAGING_DIR)/usr/include/live/UsageEnvironment \ + -I$(STAGING_DIR)/usr/include/BasicUsageEnvironment \ + -I$(STAGING_DIR)/usr/include/groupsock \ + -I$(STAGING_DIR)/usr/include/liveMedia \ + -I$(STAGING_DIR)/usr/include/UsageEnvironment \ " \ LIVE555_LIBS="-L$(STAGING_DIR)/usr/lib -lliveMedia" else diff --git a/package/whois/whois.hash b/package/whois/whois.hash index 13efa148a..858eb9452 100644 --- a/package/whois/whois.hash +++ b/package/whois/whois.hash @@ -1,2 +1,2 @@ -# From http://ftp.debian.org/debian/pool/main/w/whois/whois_5.2.1.dsc -sha256 54e6b64f16e10bfaf14ac40025b4272090298f0d9d3e62cbadabf946051515e6 whois_5.2.1.tar.xz +# From http://ftp.debian.org/debian/pool/main/w/whois/whois_5.2.2.dsc +sha256 cba874b457a6b7c4659245780d3d7321d129ab47da86103e07578ec7430fec09 whois_5.2.2.tar.xz diff --git a/package/whois/whois.mk b/package/whois/whois.mk index 13c023003..63268c6ea 100644 --- a/package/whois/whois.mk +++ b/package/whois/whois.mk @@ -4,8 +4,8 @@ # ################################################################################ -WHOIS_VERSION = 5.2.1 -WHOIS_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/w/whois +WHOIS_VERSION = 5.2.2 +WHOIS_SITE = http://snapshot.debian.org/archive/debian/20141112T101048Z/pool/main/w/whois WHOIS_SOURCE = whois_$(WHOIS_VERSION).tar.xz # take precedence over busybox implementation WHOIS_DEPENDENCIES = host-gettext $(if $(BR2_PACKAGE_BUSYBOX),busybox) diff --git a/package/wireless-regdb/wireless-regdb.hash b/package/wireless-regdb/wireless-regdb.hash index 3f19793a2..b9eabf1f5 100644 --- a/package/wireless-regdb/wireless-regdb.hash +++ b/package/wireless-regdb/wireless-regdb.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/software/network/wireless-regdb/sha256sums.asc -sha256 4a6861266026c37d1a6b1bc76b863d731765169465999c2a0028103ba4173beb wireless-regdb-2014.11.07.tar.xz +sha256 eab6b50f30748a8b0065ba38cf3df05aac161a5861ae0a6c3cfd01d38a71c9dd wireless-regdb-2014.11.18.tar.xz diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index f37b5a67b..4322fb7d3 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRELESS_REGDB_VERSION = 2014.11.07 +WIRELESS_REGDB_VERSION = 2014.11.18 WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz WIRELESS_REGDB_SITE = http://kernel.org/pub/software/network/wireless-regdb WIRELESS_REGDB_LICENSE = ISC diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index f8037b46f..4e06d5f08 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 1.16.1 +XSERVER_XORG_SERVER_VERSION = 1.16.2 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2 XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT diff --git a/support/scripts/scancpan b/support/scripts/scancpan index a049e2c7d..7ff647dce 100755 --- a/support/scripts/scancpan +++ b/support/scripts/scancpan @@ -481,6 +481,7 @@ use Pod::Usage; use File::Basename; use Module::CoreList; use HTTP::Tiny; +use Safe; use MetaCPAN::API::Tiny; my ($help, $man, $quiet, $force, $recommend, $test, $host); @@ -505,9 +506,22 @@ my %need_dlopen; # name -> 1 if requires dynamic library my %deps_build; # name -> list of host dependencies my %deps_runtime; # name -> list of target dependencies my %license_files; # name -> list of license files +my %checksum; # author -> list of checksum my $mcpan = MetaCPAN::API::Tiny->new(); my $ua = HTTP::Tiny->new(); +sub get_checksum { + my ($url) = @_; + my($path) = $url =~ m|^[^:/?#]+://[^/?#]*([^?#]*)|; + my($basename, $dirname) = fileparse( $path ); + unless ($checksum{$dirname}) { + my $response = $ua->get(qq{http://cpan.metacpan.org${dirname}CHECKSUMS}); + $checksum{$dirname} = $response->{content}; + } + my $chksum = Safe->new->reval($checksum{$dirname}); + return $chksum->{$basename}, $basename; +} + sub get_manifest { my ($author, $distname, $version) = @_; my $url = qq{http://api.metacpan.org/source/${author}/${distname}-${version}/MANIFEST}; @@ -608,6 +622,7 @@ while (my ($distname, $dist) = each %dist) { my $dirname = q{package/} . $fsname; my $cfgname = $dirname . q{/Config.in}; my $mkname = $dirname . q{/} . $fsname . q{.mk}; + my $hashname = $dirname . q{/} . $fsname . q{.hash}; my $brname = brname( $fsname ); mkdir $dirname unless -d $dirname; if ($need_target{$distname} && ($force || !-f $cfgname)) { @@ -675,6 +690,17 @@ while (my ($distname, $dist) = each %dist) { say {$fh} qq{\$(eval \$(host-perl-package))} if $need_host{$distname}; close $fh; } + if ($force || !-f $hashname) { + my($checksum, $filename) = get_checksum($dist->{download_url}); + my $md5 = $checksum->{md5}; + my $sha256 = $checksum->{sha256}; + say qq{write ${hashname}} unless $quiet; + open my $fh, q{>}, $hashname; + say {$fh} qq{# retrieved by scancpan from http://cpan.metacpan.org/}; + say {$fh} qq{md5 ${md5} ${filename}}; + say {$fh} qq{sha256 ${sha256} ${filename}}; + close $fh; + } } my %pkg;